diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-04 13:15:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-04 13:16:03 +0200 |
| commit | cd5f9f6ff87d6bb81c7906d5d31a2663707cbb1b (patch) | |
| tree | 2528cef434dfbf85d967b61a03fbb7d3fce5a3af /src/plugins/qmldesigner | |
| parent | b1401173dec00bb1ccc39ab5f8f83625f3aa0909 (diff) | |
| parent | aa8998cfb38f6227891ce104de23b1e62bd7bbcf (diff) | |
| download | qt-creator-cd5f9f6ff87d6bb81c7906d5d31a2663707cbb1b.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
Diffstat (limited to 'src/plugins/qmldesigner')
3 files changed, 15 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 8b01b260f3..c64aefedfd 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -378,7 +378,7 @@ void NodeInstanceServerProxy::writeCommand(const QVariant &command) writeCommandToIODecive(command, m_thirdSocket.data(), m_writeCommandCounter); if (m_captureFileForTest.isWritable()) { - qDebug() << "Write strean to file: " << m_captureFileForTest.fileName(); + qDebug() << "Write stream to file: " << m_captureFileForTest.fileName(); writeCommandToIODecive(command, &m_captureFileForTest, m_writeCommandCounter); qDebug() << "\twrite file: " << m_captureFileForTest.pos(); } diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 06ba8b9900..06cf93af76 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1121,6 +1121,11 @@ QString NodeMetaInfoPrivate::importDirectoryPath() const const QString targetPath = QDir(importPath).filePath(importInfo.path()); if (QDir(targetPath).exists()) return targetPath; + const QString targetPathVersion = QDir(importPath).filePath(importInfo.path() + + QLatin1Char('.') + + QString::number(importInfo.version().majorVersion())); + if (QDir(targetPathVersion).exists()) + return targetPathVersion; } } } diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp index b5e9eec8c6..a08f92b89c 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp @@ -366,6 +366,9 @@ void QmlAnchors::removeAnchors() bool QmlAnchors::instanceHasAnchor(AnchorLineType sourceAnchorLine) const { + if (!qmlItemNode().isValid()) + return false; + const PropertyName propertyName = anchorPropertyName(sourceAnchorLine); if (sourceAnchorLine & AnchorLineFill) @@ -453,6 +456,9 @@ bool QmlAnchors::instanceHasMargin(AnchorLineType sourceAnchorLineType) const static bool checkForHorizontalCycleRecusive(const QmlAnchors &anchors, QList<QmlItemNode> &visitedItems) { + if (!anchors.isValid()) + return false; + visitedItems.append(anchors.qmlItemNode()); if (anchors.instanceHasAnchor(AnchorLineLeft)) { AnchorLine leftAnchorLine = anchors.instanceAnchor(AnchorLineLeft); @@ -477,6 +483,9 @@ static bool checkForHorizontalCycleRecusive(const QmlAnchors &anchors, QList<Qml static bool checkForVerticalCycleRecusive(const QmlAnchors &anchors, QList<QmlItemNode> &visitedItems) { + if (!anchors.isValid()) + return false; + visitedItems.append(anchors.qmlItemNode()); if (anchors.instanceHasAnchor(AnchorLineTop)) { |