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/designercore/metainfo/nodemetainfo.cpp | |
| parent | b1401173dec00bb1ccc39ab5f8f83625f3aa0909 (diff) | |
| parent | aa8998cfb38f6227891ce104de23b1e62bd7bbcf (diff) | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; } } } |