diff options
| author | Andreas Wilhelm <aw@emlix.com> | 2016-07-15 16:24:10 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-09-27 15:48:45 +0000 |
| commit | cd78457c6d33bdd7c01fbcd78e50bc99e9c9acce (patch) | |
| tree | 4571554b4a9401bea51cf42f0a1a55451bdb1970 /src/dbus | |
| parent | bdb81d0bd13eb39e1b31b19e5c25112a532b2ffb (diff) | |
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 <eb@emlix.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusxmlparser.cpp | 11 | ||||
| -rw-r--r-- | src/dbus/qdbusxmlparser_p.h | 3 |
2 files changed, 7 insertions, 7 deletions
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) { diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index 7db2d12df4..d089bae163 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -52,6 +52,7 @@ // #include <QtDBus/private/qtdbusglobal_p.h> +#include <QtCore/qloggingcategory.h> #include <QtCore/qmap.h> #include "qdbusintrospection_p.h" @@ -59,6 +60,8 @@ QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(dbusParser) + /*! \internal */ |