From d3e6fa0f2eff6398bb742029e405f384ce2e987c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 29 Oct 2019 11:07:28 +0100 Subject: [PATCH] QmlDesigner: Fix some warnings Change-Id: Ice9c29409b53457c20cef272b6a5dd6feb97adb3 Reviewed-by: Thomas Hartmann --- .../qml2puppet/instances/quick3dnodeinstance.cpp | 2 ++ .../designercore/model/texttomodelmerger.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp index 27a52e48a40..ff555f6514a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp @@ -96,6 +96,8 @@ void Quick3DNodeInstance::setHideInEditor(bool b) QQuick3DNodePrivate *privateNode = QQuick3DNodePrivate::get(quick3DNode()); if (privateNode) privateNode->setIsHiddenInEditor(b); +#else + Q_UNUSED(b); #endif } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 69bc9ff0f92..a05c3b674a6 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -355,11 +355,14 @@ bool compareJavaScriptExpression(const QString &expression1, const QString &expr } bool smartVeryFuzzyCompare(const QVariant &value1, const QVariant &value2) -{ //we ignore slight changes on doubles and only check three digits - if ((value1.type() == QMetaType::Double) - || (value2.type() == QMetaType::Double) - || (value1.type() == QMetaType::Float) - || (value2.type() == QMetaType::Float)) { +{ + //we ignore slight changes on doubles and only check three digits + const auto type1 = static_cast(value1.type()); + const auto type2 = static_cast(value2.type()); + if (type1 == QMetaType::Double + || type2 == QMetaType::Double + || type1 == QMetaType::Float + || type2 == QMetaType::Float) { bool ok1, ok2; qreal a = value1.toDouble(&ok1); qreal b = value2.toDouble(&ok2);