diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-01 12:15:29 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-02 14:52:47 +0000 |
| commit | f8fa24d90147a4cc13278913e397cbf159c81b8d (patch) | |
| tree | ba0b77a541c8189fc9cb0019cebdc6cb7dd19665 | |
| parent | 169556db2f63912b7eaa2375dbc17c52ffd57586 (diff) | |
| download | qt-creator-f8fa24d90147a4cc13278913e397cbf159c81b8d.tar.gz | |
QmlDesigner: Update for change in QDir::relativeFilePath()
Change-Id: If90cba32aeca2349921870e30bd62d45a4a55e45
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()); |