Commit 9596d679 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Oswald Buddenhagen

print no message at all when no argument is supplied to error()

this is useful when an adequate message has already been emitted by
other means, like various built-ins do.

Change-Id: I092771f55969fad8b214204d666327664727c572
Reviewed-by: Lars Knoll's avatarLars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/22d1351ddea193f5c00d4ae12229358dea826c62)
parent a826f5c6
...@@ -1581,7 +1581,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( ...@@ -1581,7 +1581,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
#ifdef PROEVALUATOR_FULL #ifdef PROEVALUATOR_FULL
fputs(msg.toLatin1().constData(), stderr); fputs(msg.toLatin1().constData(), stderr);
#endif #endif
} else { } else if (!msg.isEmpty() || func_t != T_ERROR) {
m_handler->fileMessage( m_handler->fileMessage(
(func_t == T_ERROR ? QMakeHandler::ErrorMessage : (func_t == T_ERROR ? QMakeHandler::ErrorMessage :
func_t == T_WARNING ? QMakeHandler::WarningMessage : func_t == T_WARNING ? QMakeHandler::WarningMessage :
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment