diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:50:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:11:02 +0200 |
commit | eaec2b664aa2c3cbca13b425901888468a4652a1 (patch) | |
tree | 93dbd19f3b538baa81dec6c04e5258161f7d8cfb /src/dbus/qdbusinternalfilters.cpp | |
parent | 278e557ceacbe7de728987a4a5365f78e56d76b1 (diff) | |
parent | 31c251765db45a068f1268027e5dd600151af1e5 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/gui/painting/qcoregraphics.mm
src/network/access/qnetworkrequest.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5
Diffstat (limited to 'src/dbus/qdbusinternalfilters.cpp')
-rw-r--r-- | src/dbus/qdbusinternalfilters.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index ad6b06da23..03e04bb2f5 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -116,8 +116,7 @@ static QString generateSubObjectXml(QObject *object) for ( ; it != end; ++it) { QString name = (*it)->objectName(); if (!name.isEmpty() && QDBusUtil::isValidPartOfObjectPath(name)) - retval += QString::fromLatin1(" <node name=\"%1\"/>\n") - .arg(name); + retval += QLatin1String(" <node name=\"") + name + QLatin1String("\"/>\n"); } return retval; } @@ -192,8 +191,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node node.children.constEnd(); for ( ; it != end; ++it) if (it->obj || !it->children.isEmpty()) - xml_data += QString::fromLatin1(" <node name=\"%1\"/>\n") - .arg(it->name); + xml_data += QLatin1String(" <node name=\"") + it->name + QLatin1String("\"/>\n"); } xml_data += QLatin1String("</node>\n"); |