diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-09-02 14:42:51 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-09-03 09:41:48 +0200 |
| commit | 9e62375b71cf32e9deebb8815c14bb0a2346747e (patch) | |
| tree | d318e86ce90fc38d8fa636a7cef3150706324a2b /src/libs/qmljs/qmljsmodelmanagerinterface.cpp | |
| parent | ba558bc2a2abb342b014fb349a2a32e53cafcad7 (diff) | |
| download | qt-creator-9e62375b71cf32e9deebb8815c14bb0a2346747e.tar.gz | |
QmlJS: Use canonical paths for matching of import directories
We rely on string comparison for detection of QML import paths. Therefore
make sure that all paths are canonical.
Change-Id: I416bc31915644a888c416d726049668b0e71f29a
Task-number: QTCREATORBUG-12902
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 281e7461c5..a9f7adf64e 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -114,9 +114,11 @@ ModelManagerInterface::ModelManagerInterface(QObject *parent) qRegisterMetaType<QmlJS::Document::Ptr>("QmlJS::Document::Ptr"); qRegisterMetaType<QmlJS::LibraryInfo>("QmlJS::LibraryInfo"); - m_defaultProjectInfo.qtImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); + m_defaultProjectInfo.qtImportsPath = QFileInfo( + QLibraryInfo::location(QLibraryInfo::ImportsPath)).canonicalFilePath(); #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - m_defaultProjectInfo.qtQmlPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + m_defaultProjectInfo.qtQmlPath = QFileInfo( + QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)).canonicalFilePath(); #endif m_defaultImportPaths << environmentImportPaths(); |