Skip to content

Commit

Permalink
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensource
Browse files Browse the repository at this point in the history
Qt 6.2.10-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I875de95cde3cf4830c8def3fa718fac839d049ce
  • Loading branch information
Tarja Sundqvist committed Oct 4, 2024
2 parents fcb7e0b + d24e85c commit e31264d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .cmake.conf
Original file line number Diff line number Diff line change
@@ -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 "")
2 changes: 1 addition & 1 deletion .qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion examples/oauth/redditclient/conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
qtnetworkauth/6.2.9@qt/everywhere
qtnetworkauth/6.2.10@qt/everywhere

[generators]
virtualenv
2 changes: 1 addition & 1 deletion examples/oauth/twittertimeline/conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
qtnetworkauth/6.2.9@qt/everywhere
qtnetworkauth/6.2.10@qt/everywhere

[generators]
virtualenv

0 comments on commit e31264d

Please sign in to comment.