diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-08-10 09:44:49 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2021-08-10 09:07:41 +0000 |
| commit | 27d414458e67e3c33bde131270f73233b737d8a5 (patch) | |
| tree | 16e157409abc0f58e50fae80f61dffd25b6a86fa /share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d | |
| parent | af357c47fb3e9adeeb1ef8ed2ac9611e2b37f8ab (diff) | |
qmlpuppet: fix qt 5.15 builds
Change-Id: I6d19624537a3980252d43624ecf24e110638225a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp index d5acb9f582..02e6f2df59 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp @@ -328,7 +328,8 @@ void GeneralHelper::storeToolState(const QString &sceneId, const QString &tool, handlePendingToolStateUpdate(); QVariant theState; // Convert JS arrays to QVariantLists for easier handling down the line - if (state.metaType().id() != QMetaType::QString && state.canConvert(QMetaType::QVariantList)) + // metaType().id() which only exist in Qt6 is the same as userType() + if (state.userType() != QMetaType::QString && state.canConvert(QMetaType::QVariantList)) theState = state.value<QVariantList>(); else theState = state; |