diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:41:32 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 10:03:25 +0200 |
| commit | d54f3fade41a3fbfd45b9540c2970f4a8c21c820 (patch) | |
| tree | b3870e67347cfd45f24562b49cc435725c7e8223 /.qmake.conf | |
| parent | fb96051e4200550f5deafae9f2c775d894eb9c7f (diff) | |
| parent | f3d047af903801d9e7705816df5299c4e04a76f4 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
src/windeployqt/main.cpp
Change-Id: I446b51332eaaec91f502fcc2ceca52291b0b0468
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 715105c47..ed2331809 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |