feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix deprication warnings

Browse Source 
Change-Id: I98ca6791317763a5a148f1fd3138f573667666ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2024-11-28 11:51:01 +01:00
committed by Thomas Hartmann
parent 7ade402c98
commit 45d0753f0b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
View File

@@ -759,7 +759,9 @@ void GeneralHelper::storeToolState(const QString &sceneId, const QString &tool,
QVariant theState; QVariant theState;
// Convert JS arrays to QVariantLists for easier handling down the line // Convert JS arrays to QVariantLists for easier handling down the line
// metaType().id() which only exist in Qt6 is the same as typeId() // metaType().id() which only exist in Qt6 is the same as typeId()
if (state.typeId() != QMetaType::QString && state.canConvert(QMetaType::QVariantList))
if (state.typeId() != QMetaType::QString
&& QMetaType::canConvert(state.metaType(), QMetaType(QMetaType::QVariantList)))
theState = state.value<QVariantList>(); theState = state.value<QVariantList>();
else else
theState = state; theState = state;
@@ -1038,7 +1040,7 @@ void GeneralHelper::moveMultiSelection(bool commit)
QMatrix4x4 m; QMatrix4x4 m;
if (it.key()->parentNode()) if (it.key()->parentNode())
m = it.key()->parentNode()->sceneTransform(); m = it.key()->parentNode()->sceneTransform();
it.key()->setPosition(m.inverted() * newGlobalPos); it.key()->setPosition(m.inverted().map(newGlobalPos));
} }
m_blockMultiSelectionNodePositioning = !commit; m_blockMultiSelectionNodePositioning = !commit;
} }
@@ -1058,7 +1060,7 @@ void GeneralHelper::scaleMultiSelection(bool commit)
QMatrix4x4 parentMat; QMatrix4x4 parentMat;
if (it.key()->parentNode()) if (it.key()->parentNode())
parentMat = it.key()->parentNode()->sceneTransform().inverted(); parentMat = it.key()->parentNode()->sceneTransform().inverted();
it.key()->setPosition(parentMat * newGlobalPos); it.key()->setPosition(parentMat.map(newGlobalPos));
QMatrix4x4 mat; QMatrix4x4 mat;
mat.rotate(it.value().startSceneRot); mat.rotate(it.value().startSceneRot);
@@ -1067,7 +1069,7 @@ void GeneralHelper::scaleMultiSelection(bool commit)
QVector3D dimScale; QVector3D dimScale;
float diffScaleDim = diffScale[dim]; float diffScaleDim = diffScale[dim];
dimScale[dim] = diffScaleDim; dimScale[dim] = diffScaleDim;
dimScale = (mat.inverted() * dimScale).normalized() * diffScaleDim; dimScale = (mat.inverted().map(dimScale).normalized()) * diffScaleDim;
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
dimScale[i] = qAbs(dimScale[i]); dimScale[i] = qAbs(dimScale[i]);
if (sceneScale[dim] < 1.0f) if (sceneScale[dim] < 1.0f)
@@ -1096,7 +1098,7 @@ void GeneralHelper::rotateMultiSelection(bool commit)
QMatrix4x4 parentMat; QMatrix4x4 parentMat;
if (it.key()->parentNode()) if (it.key()->parentNode())
parentMat = it.key()->parentNode()->sceneTransform().inverted(); parentMat = it.key()->parentNode()->sceneTransform().inverted();
it.key()->setPosition(parentMat * newGlobalPos); it.key()->setPosition(parentMat.map(newGlobalPos));
it.key()->setRotation(it.value().startRot); it.key()->setRotation(it.value().startRot);
it.key()->rotate(rotAngle, rotAxis, QQuick3DNode::SceneSpace); it.key()->rotate(rotAngle, rotAxis, QQuick3DNode::SceneSpace);
} }