AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check in arch detection for qmake failures

Browse Source 
QMake can fail at arch detection, so remove
the silence here and fail when qmake does
not produce any Makefile.

Change-Id: I8826867952665a68f7205acf99ee6f1c9ead8513
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Andreas Holzammer 2012-09-20 21:40:39 +02:00 committed by The Qt Project
parent 7ba31ff5a4
commit 13fe38ebb9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/configure/configureapp.cpp
View File

@ -2778,11 +2778,17 @@ void Configure::detectArch()
QString subarchKey = data.subarchKey;
// run qmake
QString command = QString("%1 -spec %2 %3 2>&1")
QString command = QString("%1 -spec %2 %3")
.arg(QDir::toNativeSeparators(buildPath + "/bin/qmake.exe"),
QDir::toNativeSeparators(qmakespec),
QDir::toNativeSeparators(sourcePath + "/config.tests/arch/arch.pro"));
Environment::execute(command);
int returnValue = 0;
Environment::execute(command, &returnValue);
if (returnValue != 0) {
cout << "QMake failed!" << endl;
dictionary["DONE"] = "error";
return;
}
// compile
command = dictionary[ "MAKE" ];