diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:59:05 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:59:33 +0200 |
| commit | a5fee6bac6481a8f29fe8df78a6a084b53ff0f3c (patch) | |
| tree | 5fa5edb38c3a1f6e7f7ef47e736669bbe4d07d76 | |
| parent | d1c4e8d6e4dd6200e9c3371e43b63e18911a9cca (diff) | |
| parent | 72c2cb442f4062912ed3dd020a2449ac506aefb3 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I8810e1cd86f9d4a58b3f56322a7d68f827f10e03
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index f0511dd..34387e8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |