From c4c7a35ea5d8faee7e315d26a2251ac02ffef103 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:28:15 +0200 Subject: 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 -- cgit v1.2.3