From 7d898954aa9e3c75d44abae81dff563a8b4b003d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 10 Jul 2019 17:58:13 +0200 Subject: [PATCH 1/2] Bump Qt version to Qt 6 Change-Id: Ic01cd61ea5c53c4685fcd74e5a980d93fc4bc33a Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index de5c3ff9..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.14.0 +MODULE_VERSION = 6.0.0 CONFIG += warning_clean CMAKE_MODULE_TESTS=- From c4c7a35ea5d8faee7e315d26a2251ac02ffef103 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:28:15 +0200 Subject: [PATCH 2/2] Fix Qt6 build Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: If3202a887389351dd6efa760b0212e69582d9576 Reviewed-by: Simon Hausmann --- src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(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