diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:58:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-14 22:02:55 +0100 |
| commit | 00935bf8c29d54fcd794ce5673cb5f973808cbf9 (patch) | |
| tree | 52b470f84397b023edeb67e8ec42c01337825980 /src/dbus | |
| parent | 6292ecdf6da6c13942dd3f39c9cd164c29c7ab37 (diff) | |
| parent | cfd069181c01bbade16c173a96100819aa719613 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/gui/painting/qcoregraphics.mm
Change-Id: I4d49535cd75f2cdf0151c1dbff312cce5e159760
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusxmlparser.cpp | 5 |
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; |