1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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>
This commit is contained in:
Oswald Buddenhagen 2013-02-25 20:08:23 +01:00 committed by The Qt Project
parent dd06f991af
commit 97be79012c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/library/qmakeevaluator.cpp
View File

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