From cd78457c6d33bdd7c01fbcd78e50bc99e9c9acce Mon Sep 17 00:00:00 2001 From: Andreas Wilhelm Date: Fri, 15 Jul 2016 16:24:10 +0200 Subject: qdbusxmlparser: Enabled error output Implements behavior for the --verbose switch already specified but never implemented. Without this switch you would have to rebuild qdbusxml2cpp to see error output. Using -V will now produce error output such as: dbus.parser: unknown token "" "Characters" dbus.parser: Invalid D-BUS interface name 'com.qt-project.dbus' found while parsing introspection dbus.parser: unknown token "" "Characters" dbus.parser: skipping unknown element "method" dbus.parser: xml error "Opening and ending tag mismatch." doc "..." Task-number: QTBUG-34126 Change-Id: Ie5b7ec78007ddc305b1e7ddbffb1436920721c9c Reviewed-by: Rolf Eike Beer Reviewed-by: Thiago Macieira --- src/dbus/qdbusxmlparser.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/dbus/qdbusxmlparser.cpp') diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp index fa362bc579..3618c76a1d 100644 --- a/src/dbus/qdbusxmlparser.cpp +++ b/src/dbus/qdbusxmlparser.cpp @@ -48,15 +48,12 @@ #ifndef QT_NO_DBUS -//#define QDBUS_PARSER_DEBUG -#ifdef QDBUS_PARSER_DEBUG -# define qDBusParserError qDebug -#else -# define qDBusParserError if (true) {} else qDebug -#endif - QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(dbusParser, "dbus.parser", QtWarningMsg) + +#define qDBusParserError(...) qCDebug(dbusParser, ##__VA_ARGS__) + static bool parseArg(const QXmlStreamAttributes &attributes, QDBusIntrospection::Argument &argData, QDBusIntrospection::Interface *ifaceData) { -- cgit v1.2.3