diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | dependencies.yaml | 10 | ||||
-rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index b9382872..4e6ae979 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 00000000..fd8f6edb --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,10 @@ +dependencies: + ../qtbase: + ref: 35b5100302c9ff28a7ae286c6bca8de37683f270 + required: true + ../qtdeclarative: + ref: 02f9934f4dbb99932e3879d5a6a2ecfa96958f71 + required: false + ../qtmultimedia: + ref: 838eb6b8b42acc9e418c7f1fd2b105ce37ebf49b + required: false diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 28c3666e..5b515a04 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -144,7 +144,9 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) // New revisions qmlRegisterType<Q3DLight, 1>(uri, 1, 3, "Light3D"); - qmlRegisterModule(uri, 1, 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, 1, 15); } QT_END_NAMESPACE_DATAVISUALIZATION |