diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:21:40 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:21:40 +0200 |
| commit | 5ea87a4d0404cb5522381e7c8084259eba0e432a (patch) | |
| tree | 2cef14d0e6420b1b26d3f6b9330dd5e29ac92869 | |
| parent | 71da59f5af8282bc2e1e939c7e0550bc96712f88 (diff) | |
| parent | 4813f21919eb8b240f4b8c704b9298ac5e1d0731 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Ifeb69e2a318f1425204ea76d38264e0e243ee37d
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 37ebce428..898cedcf6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |