summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_configure.prf14
1 files changed, 11 insertions, 3 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index eaaa161270..74ad611ee5 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -28,6 +28,12 @@ defineTest(qtConfAddError) {
}
}
+defineTest(qtConfFatalError) {
+ qtConfAddError($$1, $$2)
+ qtConfPrintReport()
+ error()
+}
+
defineTest(qtConfCommandlineSetInput) {
arg = $${1}
val = $${2}
@@ -778,9 +784,7 @@ defineTest(qtConfTest_compile) {
defineTest(qtConfTest_verifySpec) {
qtConfTest_compile($$1): return(true)
- qtConfAddError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
- qtConfPrintReport()
- error()
+ qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
}
defineTest(qtConfTest_files) {
@@ -1310,6 +1314,10 @@ defineTest(qtConfReport_error) {
qtConfAddError($${1}, log)
}
+defineTest(qtConfReport_fatal) {
+ qtConfFatalError($${1})
+}
+
defineTest(qtConfCreateReportRecurse) {
equals(2, false) {
indent = ""