From 1b4487817e68a5e87eff54793b02c85792accc10 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 1 Aug 2019 10:07:01 +0200 Subject: Fix Qt6 build Also 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: Ia01ebdcf84d2e3fdaefe5dcc144530cbd8f468f5 Reviewed-by: Simon Hausmann --- src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/quick3d/imports/render') diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index a3a21f12e..07d04663d 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -316,8 +316,9 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 10, "LineWidth"); qmlRegisterType(uri, 2, 13, "RasterMode"); - // Auto-increment the import to stay in sync with ALL future Qt 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); } QT_END_NAMESPACE -- cgit v1.2.3