summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <[email protected]>2025-01-28 17:44:03 +0200
committerTarja Sundqvist <[email protected]>2025-01-28 17:44:03 +0200
commit5b00d48b2f0f3b3afe087931e56369f6c6d3f566 (patch)
treeb0661f13b5964c8d4b7c968b25e73812f3687ffe
parente081c6b146765868581e32bdd52e04d9681b5020 (diff)
parentacf745f8dbfe595195d6baf5f802b1b7774e0bc5 (diff)
Merge tag 'v6.2.12-lts' into tqtc/lts-6.2-opensourcev6.2.12-lts-lgpl6.2
Qt 6.2.12-lts release Conflicts solved: dependencies.yaml Change-Id: I01a496beb6c1b48dc53ed559d23c563a788051de
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf2
-rw-r--r--examples/oauth/redditclient/conanfile.txt2
-rw-r--r--examples/oauth/twittertimeline/conanfile.txt2
4 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 842b347..7733def 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.11")
+set(QT_REPO_MODULE_VERSION "6.2.12")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 280a596..d3a38c9 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.11
+MODULE_VERSION = 6.2.12
diff --git a/examples/oauth/redditclient/conanfile.txt b/examples/oauth/redditclient/conanfile.txt
index 072211a..2eb3a87 100644
--- a/examples/oauth/redditclient/conanfile.txt
+++ b/examples/oauth/redditclient/conanfile.txt
@@ -1,5 +1,5 @@
[requires]
-qtnetworkauth/6.2.11@qt/everywhere
+qtnetworkauth/6.2.12@qt/everywhere
[generators]
virtualenv
diff --git a/examples/oauth/twittertimeline/conanfile.txt b/examples/oauth/twittertimeline/conanfile.txt
index 072211a..2eb3a87 100644
--- a/examples/oauth/twittertimeline/conanfile.txt
+++ b/examples/oauth/twittertimeline/conanfile.txt
@@ -1,5 +1,5 @@
[requires]
-qtnetworkauth/6.2.11@qt/everywhere
+qtnetworkauth/6.2.12@qt/everywhere
[generators]
virtualenv