diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 23:09:35 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-03-04 18:31:34 +0000 |
commit | a38837056309d7c7222040df67a0e52e9d19ba37 (patch) | |
tree | be89a454b55822a522b3be981423507c247c437e /.qmake.conf | |
parent | cca15977ed4d59603bc914cba39f2a7073f49920 (diff) | |
parent | 74e86378225f2d3244c4de1ed1b5d22f59c0e97c (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: I73e756e464858a56908f78ead09fad2c5492a877
Diffstat (limited to '.qmake.conf')
-rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 24e796fe..a0cf48b9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.7 +MODULE_VERSION = 6.2.8 |