summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2016-12-22 03:59:08 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2017-01-02 07:56:29 +0000
commitf55db6738bb5a14ba6ebcfe840225fe9d2ae98c2 (patch)
tree5e91d7c21afc5ab2437619ec23b294eafa7a1338 /src/dbus
parentb29b9041b5109eb908ce5a7829b6c9c3182febb7 (diff)
Silence bogus whitespace "errors" from the DBus XML parser
Any amount of whitespace between elements is now reported as an error starting with 5.8. This is (a) wrong and (b) very confusing for users. Change-Id: I2530b2138f95912e5be07e94b7d7fdab49dedbb1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusxmlparser.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp
index 3618c76a1d..94223e1574 100644
--- a/src/dbus/qdbusxmlparser.cpp
+++ b/src/dbus/qdbusxmlparser.cpp
@@ -385,6 +385,11 @@ QDBusXmlParser::QDBusXmlParser(const QString& service, const QString& path,
case QXmlStreamReader::Comment:
// ignore comments and processing instructions
break;
+ case QXmlStreamReader::Characters:
+ // ignore whitespace
+ if (xml.isWhitespace())
+ break;
+ Q_FALLTHROUGH();
default:
qDBusParserError() << "unknown token" << xml.name() << xml.tokenString();
break;