From 13fe38ebb992a045dae8cb817d180f690429fb23 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 20 Sep 2012 21:40:39 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/configure') 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" ]; -- cgit v1.2.3