From 815a41f714df007eeee8726ada650a0aeb81ffc7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 Jul 2016 16:50:02 +0200 Subject: 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 --- mkspecs/features/android/android_deployment_settings.prf | 2 +- mkspecs/features/configure.prf | 2 +- mkspecs/features/java.prf | 2 +- mkspecs/features/moc.prf | 2 +- mkspecs/features/qt.prf | 6 +++--- mkspecs/features/qt_android_deps.prf | 2 +- mkspecs/features/qt_configure.prf | 10 +++++----- mkspecs/features/qt_functions.prf | 2 +- mkspecs/features/qt_module.prf | 2 +- mkspecs/features/qt_module_headers.prf | 6 +++--- mkspecs/features/qt_module_pris.prf | 6 +++--- mkspecs/features/qt_plugin.prf | 4 ++-- mkspecs/features/qt_tool.prf | 2 +- mkspecs/features/resources.prf | 2 +- qtbase.pro | 10 +++++----- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index ce5696a33c..848de485f8 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -65,6 +65,6 @@ contains(TEMPLATE, ".*app"):!build_pass: { isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json - write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT) | error("Aborting.") + write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT)|error() } diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index e1040d250e..bd53e31a04 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -37,7 +37,7 @@ defineTest(qtCompileTest) { # 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 diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 0f0b991f0a..852954e5ca 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -28,7 +28,7 @@ javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$AND javac.depends = FORCE QMAKE_EXTRA_COMPILERS += javac -mkpath($$absolute_path($$CLASS_DIR, $$OUT_PWD)) | error("Aborting.") +mkpath($$absolute_path($$CLASS_DIR, $$OUT_PWD))|error() # Disable all linker flags since we are overriding the regular linker QMAKE_LFLAGS = diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 6368c8e394..73fbc8c29b 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -21,7 +21,7 @@ win32:count(MOC_INCLUDEPATH, 40, >) { WIN_INCLUDETEMP_CONT = for (inc, MOC_INCLUDEPATH): \ WIN_INCLUDETEMP_CONT += -I$$inc - write_file($$absolute_path($$WIN_INCLUDETEMP, $$OUT_PWD), WIN_INCLUDETEMP_CONT)|error("Aborting.") + write_file($$absolute_path($$WIN_INCLUDETEMP, $$OUT_PWD), WIN_INCLUDETEMP_CONT)|error() } # QNX's compiler sets "gcc" config, but does not support the -dM option; diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 8d96d18d06..3146d95ef4 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -238,7 +238,7 @@ contains(qt_module_deps, qml): \ } } QML_IMPORT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_qml_plugin_import.cpp - write_file($$QML_IMPORT_CPP, IMPORT_FILE_CONT)|error("Aborting.") + write_file($$QML_IMPORT_CPP, IMPORT_FILE_CONT)|error() GENERATED_SOURCES += $$QML_IMPORT_CPP QMAKE_DISTCLEAN += $$QML_IMPORT_CPP @@ -261,7 +261,7 @@ contains(qt_module_deps, qml): \ "[Paths]" \ "Imports = $$QMAKE_QML_BUNDLE_PATH" \ "Qml2Imports = $$QMAKE_QML_BUNDLE_PATH" - write_file("$$OUT_PWD/qt.conf", QT_CONF_CONTENTS)|error("Aborting.") + write_file("$$OUT_PWD/qt.conf", QT_CONF_CONTENTS)|error() # write qt.conf and copy each qml import dir into the bundle. # But strip away archives and other files that are not needed: @@ -334,7 +334,7 @@ contains(QT_CONFIG, static) { warning("Plugin class name could not be determined for $$IMPORT_PLUG plugin.") } IMPORT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_plugin_import.cpp - write_file($$IMPORT_CPP, IMPORT_FILE_CONT)|error("Aborting.") + write_file($$IMPORT_CPP, IMPORT_FILE_CONT)|error() GENERATED_SOURCES += $$IMPORT_CPP QMAKE_DISTCLEAN += $$IMPORT_CPP } diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf index 7ec7bad047..c172ca8c4e 100644 --- a/mkspecs/features/qt_android_deps.prf +++ b/mkspecs/features/qt_android_deps.prf @@ -79,7 +79,7 @@ DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml !isEmpty(FILE_CONTENT) { FILE_CONTENT = "" $$FILE_CONTENT "" - write_file($$DEPENDENCY_FILE, FILE_CONTENT) | error("Aborting.") + write_file($$DEPENDENCY_FILE, FILE_CONTENT)|error() } } 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() } } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6dd4a36b5e..f03472d940 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -171,7 +171,7 @@ defineTest(qtAddToolEnv) { "EndLocal" $$1 = call } - !build_pass:!write_file($$OUT_PWD/$$batch_name, batch_cont, exe): error("Aborting.") + !build_pass:!write_file($$OUT_PWD/$$batch_name, batch_cont, exe): error() isEmpty(3): \ $$1 += $$shell_quote($$shell_path($$OUT_PWD/$$batch_name)) else: \ diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 923ac73200..bce8b89643 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -235,7 +235,7 @@ android: CONFIG += qt_android_deps no_linker_version_script verscript = $$verscript_in } - write_file($$OUT_PWD/$$verscript, verscript_content)|error("Aborting.") + write_file($$OUT_PWD/$$verscript, verscript_content)|error() unset(current) unset(previous) unset(verscript) diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 05d0706a33..d29e02ef3c 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -109,13 +109,13 @@ for (injection, SYNCQT.INJECTIONS) { fwd_hdr = $$member(injects, 1) MAIN_FWD = $$INC_PATH/include/$$MODULE_INCNAME/$$fwd_hdr MAIN_FWD_CONT = '$${LITERAL_HASH}include "$$member(injects, 0)"' - write_file($$MAIN_FWD, MAIN_FWD_CONT)|error("Aborting.") + write_file($$MAIN_FWD, MAIN_FWD_CONT)|error() !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD injects = $$member(injects, 2, -1) for (inject, injects) { CLASS_FWD = $$INC_PATH/include/$$MODULE_INCNAME/$$inject CLASS_FWD_CONT = '$${LITERAL_HASH}include "$$fwd_hdr"' - write_file($$CLASS_FWD, CLASS_FWD_CONT)|error("Aborting.") + write_file($$CLASS_FWD, CLASS_FWD_CONT)|error() !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD } } @@ -135,7 +135,7 @@ MODULE_MASTER_DEPS_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$${MOD MODULE_MASTER_DEPS_HEADER_CONT += "$${LITERAL_HASH}include <$$depname/$$depname>" } MODULE_MASTER_DEPS_HEADER_CONT += "$${LITERAL_HASH}endif" - write_file($$MODULE_MASTER_DEPS_HEADER, MODULE_MASTER_DEPS_HEADER_CONT)|error("Aborting.") + write_file($$MODULE_MASTER_DEPS_HEADER, MODULE_MASTER_DEPS_HEADER_CONT)|error() !git_build: QMAKE_DISTCLEAN += $$MODULE_MASTER_DEPS_HEADER } SYNCQT.HEADER_FILES += $$MODULE_MASTER_DEPS_HEADER diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 4dd9e25f9f..b67a56c7d5 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -107,7 +107,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri winrt: MODULE_PRI_CONT += \ "QT.$${MODULE_ID}.winrt_capabilities =$$join(MODULE_WINRT_CAPABILITIES, " ", " ")" \ "QT.$${MODULE_ID}.winrt_capabilities_device =$$join(MODULE_WINRT_CAPABILITIES_DEVICE, " ", " ")" - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") + write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() !internal_module:!no_private_module { module_build_type += internal_module private_deps = $$QT @@ -127,7 +127,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri "QT.$${MODULE}_private.frameworks =" \ "QT.$${MODULE}_private.depends = $$private_deps" \ "QT.$${MODULE}_private.module_config =$$join(module_build_type, " ", " ")" - write_file($$MODULE_PRIVATE_PRI, MODULE_PRIVATE_PRI_CONT)|error("Aborting.") + write_file($$MODULE_PRIVATE_PRI, MODULE_PRIVATE_PRI_CONT)|error() } MODULE_PRI_FILES = $$MODULE_PRI $$MODULE_PRIVATE_PRI @@ -162,7 +162,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri MODULE_FWD_PRI_CONT += \ "QT.$${MODULE}_private.includes $$pls= $$MODULE_FWD_PRIVATE_INCLUDES" } - write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") + write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error() touch($$MODULE_FWD_PRI, $$MODULE_PRI) MODULE_PRI_FILES += $$MODULE_FWD_PRI diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index e11b543cb4..c4fea60e0f 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -50,7 +50,7 @@ CONFIG(static, static|shared)|prefix_build { "QT_PLUGIN.$${MODULE}.EXTENDS =$$join(PLUGIN_EXTENDS, " ", " ")" \ "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" \ "QT_PLUGINS += $$MODULE" - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") + write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() MODULE_PRI_FILES = $$MODULE_PRI force_independent { @@ -59,7 +59,7 @@ CONFIG(static, static|shared)|prefix_build { MODULE_FWD_PRI_CONT = \ "QT_PLUGIN.$${MODULE}.PATH = $$MODULE_BASE_OUTDIR/plugins" \ "include($$MODULE_PRI)" - write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") + write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error() touch($$MODULE_FWD_PRI, $$MODULE_PRI) MODULE_PRI_FILES += $$MODULE_FWD_PRI diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index bdeb59c83d..93c952617d 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -60,7 +60,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ $$module_envvars - write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") + write_file($$TOOL_PRI, TOOL_PRI_CONT)|error() # Then, inject the new tool into the current cache state !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()! diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 21147e4a42..adc8e9a8ac 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -65,7 +65,7 @@ for(resource, RESOURCES) { "" !write_file($$OUT_PWD/$$resource_file, resource_file_content): \ - error("Aborting.") + error() } RESOURCES -= $$resource diff --git a/qtbase.pro b/qtbase.pro index 34f6704752..93a2f6264f 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -114,11 +114,11 @@ for (ft, features) { " QT_DISABLED_FEATURES += $$lower($$replace(ft, _, -))" } } -write_file($$OUT_PWD/src/corelib/global/qfeatures.h, FEATURES_H)|error("Aborting.") +write_file($$OUT_PWD/src/corelib/global/qfeatures.h, FEATURES_H)|error() # Create forwarding header FWD_FEATURES_H = \ '$${LITERAL_HASH}include "../../src/corelib/global/qfeatures.h"' -write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error("Aborting.") +write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error() no_features = lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines) @@ -146,15 +146,15 @@ FEATURES_PRI = \ "$$escape_expand(\\n)$${LITERAL_HASH} Dependencies derived from /src/corelib/global/qfeatures.txt:" \ $$FEATURES_PRI \ "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)" -write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.") +write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error() # Create forwarding headers for qconfig.h FWD_QCONFIG_H = \ '$${LITERAL_HASH}include "../../src/corelib/global/qconfig.h"' -write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error("Aborting.") +write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error() FWD_QTCONFIG = \ '$${LITERAL_HASH}include "qconfig.h"' -write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error("Aborting.") +write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error() # Files created by us QMAKE_DISTCLEAN += \ -- cgit v1.2.3