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/extras | |
| parent | c5f12acd27dee5fdec38b78a02a95cf7debfe9a5 (diff) | |
| parent | 336e0eb1bc21215012f56f725ebbfb5710d22814 (diff) | |
| download | qt3d-d8fc43efdafda01dd043c341b235ec30aca1c048.tar.gz | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I374bd16216ab6aa9406125c8a0c084eb9cfedb61
Diffstat (limited to 'src/quick3d/imports/extras')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index b675ec283..387bf2ce6 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -147,7 +147,7 @@ QT_WARNING_POP qmlRegisterType<Qt3DExtras::QText2DEntity>(uri, 2, 9, "Text2DEntity"); // Auto-increment the import to stay in sync with ALL future Qt minor versions - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + qmlRegisterModule(uri, 2, 15); } |