diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:47:04 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 06:38:48 +0000 |
| commit | 9649f3802ef57b191d1a693951fa0769d7e2699e (patch) | |
| tree | aad54ef1b352b63054e094f57be0fcb8994420e1 | |
| parent | b0aee755ddcf4adfde9dd36f05c4d9d80836db76 (diff) | |
| parent | e0305f57fcd89fc29810ab2ede5afb08b3a23476 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: I64a8417766c3fad623c8edbb758e51892036f06c
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | examples/oauth/redditclient/conanfile.txt | 2 | ||||
| -rw-r--r-- | examples/oauth/twittertimeline/conanfile.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 07d90b8..e62fae5 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 8b95a21..e7c4bab 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.7 +MODULE_VERSION = 6.2.8 diff --git a/dependencies.yaml b/dependencies.yaml index fee29a4..f522f48 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true diff --git a/examples/oauth/redditclient/conanfile.txt b/examples/oauth/redditclient/conanfile.txt index 72c608f..da95f7c 100644 --- a/examples/oauth/redditclient/conanfile.txt +++ b/examples/oauth/redditclient/conanfile.txt @@ -1,5 +1,5 @@ [requires] -qtnetworkauth/6.2.7@qt/everywhere +qtnetworkauth/6.2.8@qt/everywhere [generators] virtualenv diff --git a/examples/oauth/twittertimeline/conanfile.txt b/examples/oauth/twittertimeline/conanfile.txt index 72c608f..da95f7c 100644 --- a/examples/oauth/twittertimeline/conanfile.txt +++ b/examples/oauth/twittertimeline/conanfile.txt @@ -1,5 +1,5 @@ [requires] -qtnetworkauth/6.2.7@qt/everywhere +qtnetworkauth/6.2.8@qt/everywhere [generators] virtualenv |