Commit fe68b3dc authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

remove entirely pointless conditional



"**Unknown**" can only be ever returned when querying particular
properties, which we are not doing.

Change-Id: If972a44d7ef2d1ff60261f13e518d40c2a5e66e0
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent f361579f
......@@ -1176,22 +1176,20 @@ bool BaseQtVersion::queryQMakeVariables(const Utils::FileName &binary, QHash<QSt
if (index != -1) {
QString name = line.left(index);
QString value = QDir::fromNativeSeparators(line.mid(index+1));
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);
if (name == QLatin1String("QT_INSTALL_PREFIX")
|| name == QLatin1String("QT_INSTALL_DATA")
|| name == QLatin1String("QT_INSTALL_BINS")) {
name.replace(3, 7, QLatin1String("HOST"));
versionInfo->insert(name, value);
versionInfo->insert(name + QLatin1String("/get"), value);
}
} else if (name.startsWith(QLatin1String("QT_HOST_"))) {
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);
if (name == QLatin1String("QT_INSTALL_PREFIX")
|| name == QLatin1String("QT_INSTALL_DATA")
|| name == QLatin1String("QT_INSTALL_BINS")) {
name.replace(3, 7, QLatin1String("HOST"));
versionInfo->insert(name, value);
versionInfo->insert(name + QLatin1String("/get"), value);
}
} else if (name.startsWith(QLatin1String("QT_HOST_"))) {
versionInfo->insert(name + QLatin1String("/get"), value);
}
}
}
......
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