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

clean paths of found files in prepareProject()

Browse Source 
any of the directories may be the root, which would lead to double slashes
in the constructed filenames.

Change-Id: I053e167a19b795b40e780fc29db356c7f24d286a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/97be79012cd39d1d0e7748d5c500d86c3becc258)
This commit is contained in:
Oswald Buddenhagen
2013-02-25 20:08:23 +01:00
parent 9e17199e68
commit bb64e06a05
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1050,7 +1050,7 @@ bool QMakeEvaluator::prepareProject(const QString &inDir)
forever {
QString superfile = superdir + QLatin1String("/.qmake.super");
if (IoUtils::exists(superfile)) {
m_superfile = superfile;
m_superfile = QDir::cleanPath(superfile);
break;
}
QFileInfo qdfi(superdir);
@@ -1087,8 +1087,8 @@ bool QMakeEvaluator::prepareProject(const QString &inDir)
} else {
m_buildRoot = QFileInfo(cachefile).path();
}
m_conffile = conffile;
m_cachefile = cachefile;
m_conffile = QDir::cleanPath(conffile);
m_cachefile = QDir::cleanPath(cachefile);
}
no_cache: