diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 10:07:01 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 18:10:13 +0200 |
| commit | 1b4487817e68a5e87eff54793b02c85792accc10 (patch) | |
| tree | 88fd1ef5f2931ad51cacf090313c987f387dede7 /src/quick3d/imports/render | |
| parent | 58db7d01e0d424fdf46baa70e2e41b8009429c78 (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick3d/imports/render')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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<Qt3DRender::QLineWidth>(uri, 2, 10, "LineWidth"); qmlRegisterType<Qt3DRender::QRasterMode>(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 |