diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:53:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:53:15 +0200 |
| commit | 020941d16240bd5774ddf914abe57c6e4c1a67a4 (patch) | |
| tree | 08b75efc73fcf5e87ea86a62b8babddbc92a8828 | |
| parent | b794d1d460b97fbcdc8dbed20695298f2a657689 (diff) | |
| parent | 384f551844ddb9ea0042a0894a9dad7a90dd9935 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I47a50854acaa49236f1e763a5f921ec0257ecbcb
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 629ac7e..e99c121 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 |