diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:41:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:41:56 +0200 |
| commit | 589f224dbfc704a3f4f8970ce30246d9a8a0a68c (patch) | |
| tree | 5740d6faa35647111158d7eb2f6f734f5c9c97a6 | |
| parent | 3060923320a580a05a377e6051e00cff7520ae76 (diff) | |
| parent | c6caf0b09b934c03a11c1b97df8e453875332f7b (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Id6059d8ddded97f1639d40d40298035a857d322c
| -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 |