diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:39:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:39:47 +0200 |
| commit | 654e705def61e080f6c2e2f3c421ebff6863085a (patch) | |
| tree | 48feb5603dab1b4a8d5f0c47be6381aa5fdddf23 /.qmake.conf | |
| parent | a23672bad7e28cc0b9c573ad6909e15a46390657 (diff) | |
| parent | 4f943eda910e3f7864cc0ca44113ae017fa5f92b (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I6a25cd3cb2ae94cea140b37838e3fda70f22282b
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 21f7866..8f0d082 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,6 +4,6 @@ CONFIG += qt_example_installs DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 QTRO_SOURCE_TREE = $$PWD |