summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-10-19 12:35:24 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-14 06:25:40 +0000
commit31a7f45bba7d391233efe7f582cec2e5fdf2dab9 (patch)
tree7daed618c7d7485a15d50f03658a64ed79ddc270
parentf91e73bc8cacb16febe7a16a1e95d688f59d423c (diff)
downloadqtqa-31a7f45bba7d391233efe7f582cec2e5fdf2dab9.tar.gz
Update version number bump
Add version number bump for - qtbase/tests/auto/cmake/test_static_resources/.cmake.conf - qtbase/tests/auto/cmake/mockplugins/.cmake.conf - qtbase/tests/auto/cmake/test_generating_cpp_exports.cmake.conf - qtnetworkauth/examples/oauth/twittertimeline/conanfile.txt - qtnetworkauth/examples/oauth/redditclient/conanfile.txt Task-number: QTBUG-97458 Change-Id: Iad2f02bd9dd32d91407c615ad0f02888de2da780 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit 7b623ddec7c923bccb8e90548c930c8997e99c87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xscripts/qt/branch_qt.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/qt/branch_qt.py b/scripts/qt/branch_qt.py
index 0c9754c..ed54008 100755
--- a/scripts/qt/branch_qt.py
+++ b/scripts/qt/branch_qt.py
@@ -21,6 +21,7 @@ from typing import List
from configparser import ConfigParser
from enum import Enum
from textwrap import dedent
+from pathlib import Path
import git # type: ignore
@@ -346,8 +347,15 @@ class QtBranching:
}
if repo_name == 'qtbase':
cmake = r'set\(QT_REPO_MODULE_VERSION "([0-9.]+)"\)'
- bumpers.update({'util/cmake/pro2cmake.py': cmake})
- bumpers.update({'src/plugins/sqldrivers/.cmake.conf': cmake})
+ bumpers['util/cmake/pro2cmake.py'] = cmake
+ bumpers.update((f'{d}/.cmake.conf', cmake)
+ for d in ('src/plugins/sqldrivers',
+ 'tests/auto/cmake/test_static_resources',
+ 'tests/auto/cmake/test_generating_cpp_exports',
+ 'tests/auto/cmake/mockplugins'))
+ elif repo_name == 'qtnetworkauth':
+ conanfile = 'qtnetworkauth/([0-9.]+)'
+ bumpers.update((p, conanfile) for p in Path("examples/").rglob("conanfile.txt"))
bumped_files = [] # type: List[str]
for file, pattern in bumpers.items():