summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-12-10 13:57:36 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-12-10 17:20:55 +0000
commit16e3e44ce7b20f07d8a5e56f2937340cfcacd5a9 (patch)
tree98ae3a12f42a7531d1cd17450b998c7978062ba4
parentef135cc549c4b6b5a1fba9b6119487172620bd07 (diff)
downloadqt-creator-16e3e44ce7b20f07d8a5e56f2937340cfcacd5a9.tar.gz
QmlDesigner: Fix more warnings about unused parameters and functions
Change-Id: I8b569fcf60a0a21c6828d612997bbba0f737c806 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp4
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp1
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp28
3 files changed, 5 insertions, 28 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
index 4c725749e2..2d162503e9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
@@ -133,6 +133,10 @@ void Quick3DNodeInstance::setPickable(bool enable, bool checkParent, bool applyT
setPropertyVariant("pickable", enable); // allow 3D objects to receive mouse clicks
}
}
+#else
+ Q_UNUSED(enable)
+ Q_UNUSED(checkParent)
+ Q_UNUSED(applyToChildInstances)
#endif
}
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index d4f1d090ba..53cc813e0c 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -389,6 +389,7 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar
#else
Q_UNUSED(file)
+ Q_UNUSED(options)
#endif
}
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index c65a57d34f..5e119a688f 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -57,34 +57,6 @@ bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode)
return false;
}
-static QmlItemNode createQmlItemNodeFromSource(AbstractView *view, const QString &source, const QPointF &position)
-{
- QScopedPointer<Model> inputModel(Model::create("QtQuick.Item", 1, 0, view->model()));
- inputModel->setFileUrl(view->model()->fileUrl());
- QPlainTextEdit textEdit;
-
- textEdit.setPlainText(source);
- NotIndentingTextEditModifier modifier(&textEdit);
-
- QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, nullptr));
- rewriterView->setCheckSemanticErrors(false);
- rewriterView->setTextModifier(&modifier);
- inputModel->setRewriterView(rewriterView.data());
-
- if (rewriterView->errors().isEmpty() && rewriterView->rootModelNode().isValid()) {
- ModelNode rootModelNode = rewriterView->rootModelNode();
- inputModel->detachView(rewriterView.data());
-
- rootModelNode.variantProperty("x").setValue(qRound(position.x()));
- rootModelNode.variantProperty("y").setValue(qRound(position.y()));
-
- ModelMerger merger(view);
- return merger.insertModel(rootModelNode);
- }
-
- return QmlItemNode();
-}
-
QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view,
const ItemLibraryEntry &itemLibraryEntry,
const QPointF &position,