feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Do not resolve symlinks when opening a project

Browse Source 
Task-number: QTCREATORBUG-15145
Change-Id: I71ec43fa8cb0073100c988b6aa8a8a59a254af0c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-10-14 11:44:42 +03:00
committed by Orgad Shaneh
parent 981f7411d3
commit 3389e5f969
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
View File

@@ -113,11 +113,8 @@ void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files)
foreach (const JsonWizard::GeneratorFile &f, files) { foreach (const JsonWizard::GeneratorFile &f, files) {
if (f.file.attributes() & GeneratedFile::OpenProjectAttribute) { if (f.file.attributes() & GeneratedFile::OpenProjectAttribute) {
QString errorMessage; QString errorMessage;
QString path = f.file.path(); const QFileInfo fi(f.file.path());
const QFileInfo fi(path); const QString path = fi.absoluteFilePath();
if (fi.exists())
path = fi.canonicalFilePath();
Utils::MimeDatabase mdb; Utils::MimeDatabase mdb;
Utils::MimeType mt = mdb.mimeTypeForFile(fi); Utils::MimeType mt = mdb.mimeTypeForFile(fi);

6
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1735,10 +1735,8 @@ ProjectExplorerPlugin::OpenProjectResult ProjectExplorerPlugin::openProjects(con
foreach (const QString &fileName, fileNames) { foreach (const QString &fileName, fileNames) {
QTC_ASSERT(!fileName.isEmpty(), continue); QTC_ASSERT(!fileName.isEmpty(), continue);
QFileInfo fi = QFileInfo(fileName); const QFileInfo fi(fileName);
QString filePath = fileName; const QString filePath = fi.absoluteFilePath();
if (fi.exists()) // canonicalFilePath will be empty otherwise!
filePath = fi.canonicalFilePath();
bool found = false; bool found = false;
foreach (Project *pi, SessionManager::projects()) { foreach (Project *pi, SessionManager::projects()) {
if (filePath == pi->projectFilePath().toString()) { if (filePath == pi->projectFilePath().toString()) {