diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index cdd10e74411..e098a756f2e 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -125,7 +125,7 @@ NodeInstance &NodeInstance::operator=(const NodeInstance &other) ModelNode NodeInstance::modelNode() const { if (d) - return d->modelNode; + return d->modelNode; else return ModelNode(); } @@ -170,7 +170,7 @@ void NodeInstance::setY(double y) bool NodeInstance::hasAnchors() const { - return hasAnchor("anchors.fill") + return hasAnchor("anchors.fill") || hasAnchor("anchors.centerIn") || hasAnchor("anchors.top") || hasAnchor("anchors.left") @@ -206,7 +206,7 @@ void NodeInstance::makeInvalid() QRectF NodeInstance::boundingRect() const { if (isValid()) - return d->boundingRect; + return d->boundingRect; else return QRectF(); } @@ -214,7 +214,7 @@ QRectF NodeInstance::boundingRect() const QRectF NodeInstance::contentItemBoundingRect() const { if (isValid()) - return d->contentItemBoundingRect; + return d->contentItemBoundingRect; else return QRectF(); } diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 3bead850a80..657acce624c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -188,7 +188,7 @@ void NodeInstanceView::handleChrash() if (elaspsedTimeSinceLastCrash > 2000) restartProcess(); else - emit qmlPuppetCrashed(); + emit qmlPuppetCrashed(); emitCustomNotification(QStringLiteral("puppet crashed")); } diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index fe97abea273..b397d1a2646 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -353,7 +353,6 @@ QProcessEnvironment PuppetCreator::processEnvironment() const else environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); } - return environment.toProcessEnvironment(); } diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 276a775d5e5..4695067f190 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -109,7 +109,7 @@ const ModelNode AbstractView::rootModelNode() const ModelNode AbstractView::rootModelNode() { Q_ASSERT(model()); - return ModelNode(model()->d->rootNode(), model(), this); + return ModelNode(model()->d->rootNode(), model(), this); } /*! diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 20547ce3bd4..a8c87888b9c 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -1836,7 +1836,7 @@ QString Model::pathForImport(const Import &import) if (!rewriterView()) return QString(); - return rewriterView()->pathForImport(import); + return rewriterView()->pathForImport(import); } QStringList Model::importPaths() const diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index e608894e735..a259f3f753b 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -99,7 +99,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary NodeAbstractProperty parentProperty = parentQmlItemNode.defaultNodeAbstractProperty(); - return QmlItemNode::createQmlItemNode(view, itemLibraryEntry, position, parentProperty); + return QmlItemNode::createQmlItemNode(view, itemLibraryEntry, position, parentProperty); } QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibraryEntry &itemLibraryEntry, const QPointF &position, NodeAbstractProperty parentproperty) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 702a2e68fd6..6ab8cd7dd04 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -262,12 +262,12 @@ static inline QVariant convertDynamicPropertyValueToVariant(const QString &astVa static bool isListElementType(const QmlDesigner::TypeName &type) { - return type == "ListElement" || type == "QtQuick.ListElement" || type == "Qt.ListElement"; + return type == "ListElement" || type == "QtQuick.ListElement" || type == "Qt.ListElement"; } static bool isComponentType(const QmlDesigner::TypeName &type) { - return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component" || type == ".QQmlComponent"; + return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component" || type == ".QQmlComponent"; } static bool isCustomParserType(const QString &type) @@ -281,12 +281,12 @@ static bool isCustomParserType(const QString &type) static bool isPropertyChangesType(const QmlDesigner::TypeName &type) { - return type == "PropertyChanges" || type == "QtQuick.PropertyChanges" || type == "Qt.PropertyChanges"; + return type == "PropertyChanges" || type == "QtQuick.PropertyChanges" || type == "Qt.PropertyChanges"; } static bool isConnectionsType(const QmlDesigner::TypeName &type) { - return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections"; + return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections"; } static bool propertyIsComponentType(const QmlDesigner::NodeAbstractProperty &property, const QmlDesigner::TypeName &type, QmlDesigner::Model *model)