From be1afbd6bb59d50c8d5ed1e69ea27a6fe0fee945 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 6 Mar 2012 17:48:01 +0100
Subject: [PATCH] QtVersion: Pass on all qmake properties to the ProFileParser
Task-number: QTCREATORBUG-6896
Change-Id: I30a9f9013d91f0cc4937ec376f63d408133ba40c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 327d545852d..fc3296605da 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1106,28 +1106,9 @@ bool BaseQtVersion::queryQMakeVariables(const Utils::FileName &binary, QHash<QSt
*qmakeIsExecutable = qmake.exists() && qmake.isExecutable() && !qmake.isDir();
if (!*qmakeIsExecutable)
return false;
- static const char * const variables[] = {
- "QT_VERSION",
- "QT_INSTALL_DATA",
- "QT_INSTALL_LIBS",
- "QT_INSTALL_HEADERS",
- "QT_INSTALL_DEMOS",
- "QT_INSTALL_EXAMPLES",
- "QT_INSTALL_CONFIGURATION",
- "QT_INSTALL_TRANSLATIONS",
- "QT_INSTALL_PLUGINS",
- "QT_INSTALL_BINS",
- "QT_INSTALL_DOCS",
- "QT_INSTALL_PREFIX",
- "QT_INSTALL_IMPORTS",
- "QMAKEFEATURES"
- };
- const QString queryArg = QLatin1String("-query");
- QStringList args;
- for (uint i = 0; i < sizeof variables / sizeof variables[0]; ++i)
- args << queryArg << QLatin1String(variables[i]);
+
QProcess process;
- process.start(qmake.absoluteFilePath(), args, QIODevice::ReadOnly);
+ process.start(qmake.absoluteFilePath(), QStringList(QLatin1String("-query")), QIODevice::ReadOnly);
if (!process.waitForStarted()) {
*qmakeIsExecutable = false;
qWarning("Cannot start '%s': %s", qPrintable(binary.toUserOutput()), qPrintable(process.errorString()));
--
GitLab