diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:51:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:51:12 +0200 |
| commit | d8fc43efdafda01dd043c341b235ec30aca1c048 (patch) | |
| tree | 536e4855f132fdeda5a6699aac155ba472b69853 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
| parent | c5f12acd27dee5fdec38b78a02a95cf7debfe9a5 (diff) | |
| parent | 336e0eb1bc21215012f56f725ebbfb5710d22814 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I374bd16216ab6aa9406125c8a0c084eb9cfedb61
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
| -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 e16314c8e..947e3d2f1 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -320,8 +320,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 |