Commit 4cabd8b0 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Friedemann Kleint

populate qt 5 /get and /raw property variations

the qmake -query output cuts away unmodified variations, so we need to
re-add them.

Change-Id: I1d19485dba0222931cf83aeda3ecbf19e386bf14
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent ec379726
......@@ -1130,9 +1130,19 @@ bool BaseQtVersion::queryQMakeVariables(const Utils::FileName &binary, QHash<QSt
const QString line = stream.readLine();
const int index = line.indexOf(QLatin1Char(':'));
if (index != -1) {
const QString name = line.left(index);
const QString value = QDir::fromNativeSeparators(line.mid(index+1));
if (value != QLatin1String("**Unknown**"))
versionInfo->insert(line.left(index), value);
if (value != QLatin1String("**Unknown**")) {
versionInfo->insert(name, value);
if (name.startsWith(QLatin1String("QT_")) && !name.contains(QLatin1Char('/'))) {
if (name.startsWith(QLatin1String("QT_INSTALL_"))) {
versionInfo->insert(name + QLatin1String("/raw"), value);
versionInfo->insert(name + QLatin1String("/get"), value);
} else if (name.startsWith(QLatin1String("QT_HOST_"))) {
versionInfo->insert(name + QLatin1String("/get"), value);
}
}
}
}
}
return true;
......
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