diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-04 14:04:12 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-04 14:38:29 +0300 |
| commit | e31264dd0304522b78c91c664ede82df0c001f4d (patch) | |
| tree | 6df08383c48311e1aca2078843788b14d6586131 | |
| parent | fcb7e0bcf05dd060ddd9b0c874d61b638bb77f34 (diff) | |
| parent | d24e85c96c5131e059f1519d7d804d2ff8a6b337 (diff) | |
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl
Qt 6.2.10-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I875de95cde3cf4830c8def3fa718fac839d049ce
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/oauth/redditclient/conanfile.txt | 2 | ||||
| -rw-r--r-- | examples/oauth/twittertimeline/conanfile.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index beccb22..31a36e3 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.9") +set(QT_REPO_MODULE_VERSION "6.2.10") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index b55da47..ee9ae54 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,5 +3,5 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.9 +MODULE_VERSION = 6.2.10 diff --git a/examples/oauth/redditclient/conanfile.txt b/examples/oauth/redditclient/conanfile.txt index b4bbeab..dd56ce4 100644 --- a/examples/oauth/redditclient/conanfile.txt +++ b/examples/oauth/redditclient/conanfile.txt @@ -1,5 +1,5 @@ [requires] -qtnetworkauth/6.2.9@qt/everywhere +qtnetworkauth/6.2.10@qt/everywhere [generators] virtualenv diff --git a/examples/oauth/twittertimeline/conanfile.txt b/examples/oauth/twittertimeline/conanfile.txt index b4bbeab..dd56ce4 100644 --- a/examples/oauth/twittertimeline/conanfile.txt +++ b/examples/oauth/twittertimeline/conanfile.txt @@ -1,5 +1,5 @@ [requires] -qtnetworkauth/6.2.9@qt/everywhere +qtnetworkauth/6.2.10@qt/everywhere [generators] virtualenv |