diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:31:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:31:24 +0200 |
| commit | f7627258e31f4aec63edda5f15c4530b1b66c152 (patch) | |
| tree | d29fe993f34daa9e54251e8271e61ca2d4b2c2ee | |
| parent | 7e3bb2a05bc54a9d16c793ab1d22cb63f87077ca (diff) | |
| parent | 1c361fe93ea27706928047b8e4e4b2d9aea174fb (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Ibd48cdbdf468dce6f0ce744674944bb64c3bf5ac
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 715105c4..ed233180 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index e50ab84c..8c5d52c4 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -347,8 +347,9 @@ public: // QtCharts 2.3 qmlRegisterType<QValueAxis, 1>(uri, 2, 3, "ValueAxis"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 2, 15); } }; |