From f8fa24d90147a4cc13278913e397cbf159c81b8d Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 1 Sep 2015 12:15:29 +0200 Subject: QmlDesigner: Update for change in QDir::relativeFilePath() Change-Id: If90cba32aeca2349921870e30bd62d45a4a55e45 Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index eee38122bd..5adcbfcead 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -383,7 +383,7 @@ public: // should probably try to make it relatve to some import path, not to the document path QString relativeDir = dir.relativeFilePath(path); QString name = relativeDir.replace(QLatin1Char('/'), QLatin1Char('.')); - if (!name.isEmpty()) + if (!name.isEmpty() && name != QLatin1String(".")) typeName.prepend(name + QLatin1Char('.')); } else if (importInfo.isValid() && importInfo.type() == ImportType::QrcDirectory) { QString path = QrcParser::normalizedQrcDirectoryPath(importInfo.path()); -- cgit v1.2.1