diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-08-05 11:55:25 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-08-08 14:53:39 +0000 |
commit | 791afd00553fee569152be9cac225b851ac2b641 (patch) | |
tree | 6995017b8d3f7edca74fb0fc013db788739d8b7d /src/qdbus | |
parent | 3ed047474474fce0c6e4f6f17acee055c321b3a9 (diff) | |
download | qttools-791afd00553fee569152be9cac225b851ac2b641.tar.gz |
Adjust to QDomDocument::setContent change
With the refactoring of setContent introduce in
8cc389068be398ad20188170c245ca5de305c92e, we would now need two implicit
conversions for setContent to work with QDBusReply<QString>, but C++
only allows one.
While ideally, we would adjust QAnyString to accept types convertible to
QString (QTBUG-105389), add conversions to QString as a hotfix
to unblock the submodule update.
Change-Id: I00fe105aa328156a0c72556c86b1c224b02959bb
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/qdbus')
-rw-r--r-- | src/qdbus/qdbus/qdbus.cpp | 4 | ||||
-rw-r--r-- | src/qdbus/qdbusviewer/qdbusmodel.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp index 35e344119..251fa733b 100644 --- a/src/qdbus/qdbus/qdbus.cpp +++ b/src/qdbus/qdbus/qdbus.cpp @@ -109,7 +109,7 @@ static void listObjects(const QString &service, const QString &path) } QDomDocument doc; - doc.setContent(xml); + doc.setContent(xml.value()); QDomElement node = doc.documentElement(); QDomElement child = node.firstChildElement(); while (!child.isNull()) { @@ -194,7 +194,7 @@ static void listAllInterfaces(const QString &service, const QString &path) } QDomDocument doc; - doc.setContent(xml); + doc.setContent(xml.value()); QDomElement node = doc.documentElement(); QDomElement child = node.firstChildElement(); while (!child.isNull()) { diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp index 094b46324..0da1dea44 100644 --- a/src/qdbus/qdbusviewer/qdbusmodel.cpp +++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp @@ -72,7 +72,7 @@ QDomDocument QDBusModel::introspect(const QString &path) return doc; } - doc.setContent(xml); + doc.setContent(xml.value()); return doc; } |