summaryrefslogtreecommitdiffstats
path: root/src/qdbus/qdbusviewer/qdbusmodel.cpp
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2022-08-05 11:55:25 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2022-08-08 14:53:39 +0000
commit791afd00553fee569152be9cac225b851ac2b641 (patch)
tree6995017b8d3f7edca74fb0fc013db788739d8b7d /src/qdbus/qdbusviewer/qdbusmodel.cpp
parent3ed047474474fce0c6e4f6f17acee055c321b3a9 (diff)
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/qdbusviewer/qdbusmodel.cpp')
-rw-r--r--src/qdbus/qdbusviewer/qdbusmodel.cpp2
1 files changed, 1 insertions, 1 deletions
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;
}