diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:11:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:11:26 +0200 |
| commit | cda4448ba679bca8af9fe116028ded44fa930f96 (patch) | |
| tree | da3647a54692dc32c84e1716567d12f1cf369891 | |
| parent | 06fd8ae5d54758f502c9f043885f37f672733d55 (diff) | |
| parent | 1987f30831954ce05b6d7908b4866999b2d9b183 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Ia67e234daea1d042d8591e224065ed784060f5b4
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1ee23b1b0..bc93bfbc8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |