From 3389e5f969025aac1147ca52ee64f48918063523 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 14 Oct 2015 11:44:42 +0300 Subject: [PATCH] ProjectExplorer: Do not resolve symlinks when opening a project Task-number: QTCREATORBUG-15145 Change-Id: I71ec43fa8cb0073100c988b6aa8a8a59a254af0c Reviewed-by: Daniel Teske Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp | 7 ++----- src/plugins/projectexplorer/projectexplorer.cpp | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp index af2641351c2..8f4b49b4f86 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp @@ -113,11 +113,8 @@ void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files) foreach (const JsonWizard::GeneratorFile &f, files) { if (f.file.attributes() & GeneratedFile::OpenProjectAttribute) { QString errorMessage; - QString path = f.file.path(); - const QFileInfo fi(path); - - if (fi.exists()) - path = fi.canonicalFilePath(); + const QFileInfo fi(f.file.path()); + const QString path = fi.absoluteFilePath(); Utils::MimeDatabase mdb; Utils::MimeType mt = mdb.mimeTypeForFile(fi); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 266d00e4ad0..b5e7778e9f5 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1735,10 +1735,8 @@ ProjectExplorerPlugin::OpenProjectResult ProjectExplorerPlugin::openProjects(con foreach (const QString &fileName, fileNames) { QTC_ASSERT(!fileName.isEmpty(), continue); - QFileInfo fi = QFileInfo(fileName); - QString filePath = fileName; - if (fi.exists()) // canonicalFilePath will be empty otherwise! - filePath = fi.canonicalFilePath(); + const QFileInfo fi(fileName); + const QString filePath = fi.absoluteFilePath(); bool found = false; foreach (Project *pi, SessionManager::projects()) { if (filePath == pi->projectFilePath().toString()) {