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

QtVersion: Pass on all qmake properties to the ProFileParser

Browse Source 
Task-number: QTCREATORBUG-6896

Change-Id: I30a9f9013d91f0cc4937ec376f63d408133ba40c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Daniel Teske
2012-03-06 17:48:01 +01:00
parent 6e4aa3f8b9
commit be1afbd6bb
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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