summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_configure.prf
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-14 16:50:02 +0200
committerLars Knoll <lars.knoll@qt.io>2016-08-08 09:48:41 +0000
commit815a41f714df007eeee8726ada650a0aeb81ffc7 (patch)
tree6f407de61703b8a698ad0b0f4fc8864451ad263a /mkspecs/features/qt_configure.prf
parent22d1351ddea193f5c00d4ae12229358dea826c62 (diff)
make use of silent error() emission
get rid of the entirely superfluous stock "Aborting." messages - the event triggering the exit has already reported the problem. Change-Id: Ib9dfb9e4212f60eceb2ea432cdf56c5a8afe9d65 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
-rw-r--r--mkspecs/features/qt_configure.prf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index bae050ae18..dc1c1ef524 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -260,7 +260,7 @@ defineTest(qtConfTest_shell) {
test_out_dir = $$shadowed($$test_dir)
test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&"
- mkpath($$test_out_dir)|error("Aborting.")
+ mkpath($$test_out_dir)|error()
qtRunLoggedCommand("$$test_cmd_base $$test_dir/$${test} $${args}"): \
return(false)
@@ -272,7 +272,7 @@ defineReplace(qtConfToolchainSupportsFlag) {
test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&"
conftest = "int main() { return 0; }"
- write_file("$$test_out_dir/conftest.cpp", conftest)|error("Aborting.")
+ write_file("$$test_out_dir/conftest.cpp", conftest)|error()
qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $${1} -o conftest-out conftest.cpp"): \
return(true)
@@ -436,7 +436,7 @@ defineTest(qtConfTest_compile) {
# Clean up after previous run
exists($$test_out_dir/Makefile): qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
- mkpath($$test_out_dir)|error("Aborting.")
+ mkpath($$test_out_dir)|error()
!isEmpty(QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF
@@ -912,7 +912,7 @@ defineTest(qtConfPrintReport) {
}
!equals(config.input.continue, yes): \
- error("Aborting.")
+ error()
}
}
@@ -1156,7 +1156,7 @@ defineTest(qtConfProcessOutput) {
defined(qtConfOutputPostProcess_$${type}, test): \
qtConfOutputPostProcess_$${type}()
- write_file($$file, config.output.$${type})|error("Aborting.")
+ write_file($$file, config.output.$${type})|error()
}
}