diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 07:23:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 07:24:04 +0200 |
| commit | e88a00551c7e3f7e0212ea2580537ff7583f0bd3 (patch) | |
| tree | 7f997ed561829f8f218252afaae0ff14523dc4e5 | |
| parent | 82d4d38d2037ae36b38fe81916b14feb4068972b (diff) | |
| parent | fb7dcc7c49ab5e30af30a1d73510d7fa1871e2d1 (diff) | |
| download | qtx11extras-e88a00551c7e3f7e0212ea2580537ff7583f0bd3.tar.gz | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I49dcc6cf9548ab40f7c48ff535a669d3d07f757d
| -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 |