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

resolve relative paths in $QMAKEPATH & $QMAKEFEATURES

Browse Source 
we use the actual current directory as the base dir, as that's closest
to what qmake would do so far. it's completely arbitrary what will
happen when shadow-building or specifying an output directory, and in
creator context it's pretty much meaningless.

Change-Id: I8c490c86fa2606fcee5d176c90c5a84a4783e87b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-24 18:25:46 +02:00
parent 2debcc2881
commit 662e6f1119
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shared/proparser/qmakeglobals.cpp
View File

@@ -182,10 +182,11 @@ QStringList QMakeGlobals::getPathListEnv(const QString &var) const
QStringList ret; QStringList ret;
QString val = getEnv(var); QString val = getEnv(var);
if (!val.isEmpty()) { if (!val.isEmpty()) {
QDir bdir;
QStringList vals = val.split(dirlist_sep); QStringList vals = val.split(dirlist_sep);
ret.reserve(vals.length()); ret.reserve(vals.length());
foreach (const QString &it, vals) foreach (const QString &it, vals)
ret << QDir::cleanPath(it); ret << QDir::cleanPath(bdir.absoluteFilePath(it));
} }
return ret; return ret;
} }