From 825244224eedd865d19ef1a772dba955d54bcd60 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 15 Nov 2013 17:28:36 +0100
Subject: [PATCH] Project: Do not lose project file path information
... when opening a project that is no longer found on disk.
Task-number: QTCREATORBUG-10703
Change-Id: I5163c85469d354d2cf48959dcae6303c69392b8f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/projectexplorer/projectexplorer.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index dd7d07e460b..413f49d12b1 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1355,10 +1355,12 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
QTC_ASSERT(!fileName.isEmpty(), continue);
QFileInfo fi = QFileInfo(fileName);
- QString canonicalFilePath = fi.canonicalFilePath();
+ QString filePath = fileName;
+ if (fi.exists()) // canonicalFilePath will be empty otherwise!
+ filePath = fi.canonicalFilePath();
bool found = false;
foreach (Project *pi, SessionManager::projects()) {
- if (canonicalFilePath == pi->projectFilePath()) {
+ if (filePath == pi->projectFilePath()) {
found = true;
break;
}
@@ -1374,7 +1376,7 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
foreach (IProjectManager *manager, projectManagers) {
if (manager->mimeType() == mt.type()) {
QString tmp;
- if (Project *pro = manager->openProject(canonicalFilePath, &tmp)) {
+ if (Project *pro = manager->openProject(filePath, &tmp)) {
if (pro->restoreSettings()) {
connect(pro, SIGNAL(fileListChanged()), this, SIGNAL(fileListChanged()));
SessionManager::addProject(pro);
--
GitLab