summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor/qmljsmodelmanager.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-09-08 15:10:35 +0200
committerRoberto Raggi <roberto.raggi@nokia.com>2010-09-08 15:13:12 +0200
commitba0323974914166150a40878b14405659a7a5329 (patch)
treef4560a5d13fde1a0c3ccc7468ab32689f44ab4c3 /src/plugins/qmljseditor/qmljsmodelmanager.cpp
parentafd4e3047cc503b88150f7ddaaa6117ec2e3338e (diff)
downloadqt-creator-ba0323974914166150a40878b14405659a7a5329.tar.gz
Concate strings instead of using the QDir API to speed up the linking phase.
Reviewed-by: Christian Kamm
Diffstat (limited to 'src/plugins/qmljseditor/qmljsmodelmanager.cpp')
-rw-r--r--src/plugins/qmljseditor/qmljsmodelmanager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index b6b3ffeb9d..479d5b98f5 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -466,7 +466,8 @@ void ModelManager::loadPluginTypes(const QString &libraryPath, const QString &im
void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &importPath, const QString &importUri)
{
- if (m_runningQmldumps.values().contains(libraryPath))
+ const QString canonicalLibraryPath = QDir::cleanPath(libraryPath);
+ if (m_runningQmldumps.values().contains(canonicalLibraryPath))
return;
static QString qmldumpPath;
@@ -500,7 +501,7 @@ void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &
args << importPath;
args << importUri;
process->start(qmldumpPath, args);
- m_runningQmldumps.insert(process, libraryPath);
+ m_runningQmldumps.insert(process, canonicalLibraryPath);
}
void ModelManager::updateImportPaths()