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

QmlDesigner: Fix more warnings about unused parameters and functions

Browse Source 
Change-Id: I8b569fcf60a0a21c6828d612997bbba0f737c806
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Kandeler
2019-12-10 13:57:36 +01:00
parent ef135cc549
commit 16e3e44ce7
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
View File

@@ -133,6 +133,10 @@ void Quick3DNodeInstance::setPickable(bool enable, bool checkParent, bool applyT
setPropertyVariant("pickable", enable); // allow 3D objects to receive mouse clicks setPropertyVariant("pickable", enable); // allow 3D objects to receive mouse clicks
} }
} }
#else
Q_UNUSED(enable)
Q_UNUSED(checkParent)
Q_UNUSED(applyToChildInstances)
#endif #endif
} }

1
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
View File

@@ -389,6 +389,7 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar
#else #else
Q_UNUSED(file) Q_UNUSED(file)
Q_UNUSED(options)
#endif #endif
} }

28
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -57,34 +57,6 @@ bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode)
return false; 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, QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view,
const ItemLibraryEntry &itemLibraryEntry, const ItemLibraryEntry &itemLibraryEntry,
const QPointF &position, const QPointF &position,