Commit 662e6f11 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

resolve relative paths in $QMAKEPATH & $QMAKEFEATURES



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: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 2debcc28
......@@ -182,10 +182,11 @@ QStringList QMakeGlobals::getPathListEnv(const QString &var) const
QStringList ret;
QString val = getEnv(var);
if (!val.isEmpty()) {
QDir bdir;
QStringList vals = val.split(dirlist_sep);
ret.reserve(vals.length());
foreach (const QString &it, vals)
ret << QDir::cleanPath(it);
ret << QDir::cleanPath(bdir.absoluteFilePath(it));
}
return ret;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment