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

remove entirely pointless conditional

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

Change-Id: If972a44d7ef2d1ff60261f13e518d40c2a5e66e0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 16:23:51 +02:00
parent f361579f92
commit fe68b3dc6e
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -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);
}
}
}