Commit ba0323974914166150a40878b14405659a7a5329

Concate strings instead of using the QDir API to speed up the linking phase.

Reviewed-by: Christian Kamm
src/libs/qmljs/qmljslink.cpp
(4 / 5)
  
295295 // check the filesystem
296296 const QString packagePath = Bind::toString(import->importUri, QDir::separator());
297297 foreach (const QString &importPath, _importPaths) {
298 QDir dir(importPath);
299 if (!dir.cd(packagePath))
300 continue;
298 QString libraryPath = importPath;
299 libraryPath += QDir::separator();
300 libraryPath += packagePath;
301301
302 const QString &libraryPath = dir.path();
303302 const LibraryInfo libraryInfo = _snapshot.libraryInfo(libraryPath);
304303 if (!libraryInfo.isValid())
305304 continue;
……
325325 continue;
326326
327327 importedTypes.insert(component.typeName);
328 if (Document::Ptr importedDoc = _snapshot.document(dir.filePath(component.fileName))) {
328 if (Document::Ptr importedDoc = _snapshot.document(libraryPath + QDir::separator() + component.fileName)) {
329329 if (importedDoc->bind()->rootObjectValue())
330330 namespaceObject->setProperty(component.typeName, importedDoc->bind()->rootObjectValue());
331331 }
src/plugins/qmljseditor/qmljsmodelmanager.cpp
(3 / 2)
  
466466
467467void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &importPath, const QString &importUri)
468468{
469 if (m_runningQmldumps.values().contains(libraryPath))
469 const QString canonicalLibraryPath = QDir::cleanPath(libraryPath);
470 if (m_runningQmldumps.values().contains(canonicalLibraryPath))
470471 return;
471472
472473 static QString qmldumpPath;
……
501501 args << importPath;
502502 args << importUri;
503503 process->start(qmldumpPath, args);
504 m_runningQmldumps.insert(process, libraryPath);
504 m_runningQmldumps.insert(process, canonicalLibraryPath);
505505}
506506
507507void ModelManager::updateImportPaths()