diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:40:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:40:28 +0200 |
| commit | 2ddeefbb068a23ef59d40f69a6cec5db43895d11 (patch) | |
| tree | 12a845bceb55017581ba0457afbb253080a077ef | |
| parent | c11bc2ee5bb2fe1440ca245fc1751db40ec0d59f (diff) | |
| parent | a5b0495ac273bcc841298b52dae3ca9bb608edf7 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I75b8b04c465a6e4ec74ced9051f4a5d645ee1a31
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1121008..8b97f9b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |