diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 07:25:51 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 07:25:58 +0200 |
| commit | f602b8163fb61d260f331ae7cabba591bde85fb4 (patch) | |
| tree | 148aa0c6e3203be2d7a4b56ae1771cb5566f2eac /.qmake.conf | |
| parent | cb8cf3e7fd7a4ea39c25057c59888112e342ee66 (diff) | |
| parent | 078483c9707b039c9480915eb92257c861acd017 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
examples/serialport/cenumerator/main.cpp
Change-Id: If1d733365bf6093537f5459485425525f69a3d26
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index b3c7403c..85f18db7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |