diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:36:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:36:44 +0200 |
| commit | dc55b5b0525eacae27e810ed26d3ae827c62c048 (patch) | |
| tree | 5c247d9745602627ae31f96d0eb28e2431824458 | |
| parent | 5651ee826fa129f5d893ee280d83c1cf2aa7eb2f (diff) | |
| parent | c9e240bc24e276bbe79c0cf0c7ee8ea3aab59625 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I631d81983126f8da2bf5312d753a73ddf5fe862e
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 82a9b91..7b3bf36 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.0 +MODULE_VERSION = 6.0.0 CMAKE_MODULE_TESTS = - |