summaryrefslogtreecommitdiff
path: root/qtbase.pro
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 /qtbase.pro
parent22d1351ddea193f5c00d4ae12229358dea826c62 (diff)
downloadqtbase-815a41f714df007eeee8726ada650a0aeb81ffc7.tar.gz
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 'qtbase.pro')
-rw-r--r--qtbase.pro10
1 files changed, 5 insertions, 5 deletions
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 <qtbase>/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 += \