diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 3769089ff8dd46e23dc8805de7316edace29ed29..64c4b1a12cdcf380e0524e0038465cc0e7d64c7b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -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;