summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 85002e3a66..6e8105e8a4 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -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" ];