diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-09-20 21:40:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 06:07:31 +0200 |
| commit | 13fe38ebb992a045dae8cb817d180f690429fb23 (patch) | |
| tree | 84d71e57464138501c28a9501b7d14d35264ce38 | |
| parent | 7ba31ff5a4f5b3a395efb7821df9834c76f9eb71 (diff) | |
| download | qtbase-13fe38ebb992a045dae8cb817d180f690429fb23.tar.gz | |
Check in arch detection for qmake failures
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>
| -rw-r--r-- | tools/configure/configureapp.cpp | 10 |
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" ]; |