diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-01-29 12:37:02 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-22 04:38:56 +0100 |
| commit | 8b54cfff829490cf2e3e34051c3c1ccb02cc093a (patch) | |
| tree | 61daefb837fb9df8d3426a9d82c4062d7954b5f5 /src/dbus/qdbusmetaobject.cpp | |
| parent | c1d4a634cb439a3c1cc3ce762eb5ace6bb6ead95 (diff) | |
Make D-Bus types without a matching Qt one prettier in qdbus
Print "QMap<QString,QString>" for "a{ss}" and print a nicer expansion of
other types.
Change-Id: I0a7a2ecf8f0a62bd97931f3c129cd4cb4f471ef1
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/dbus/qdbusmetaobject.cpp')
| -rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 392eac6081..8337a84614 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -220,8 +220,11 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature, } else if (signature == "a{sv}") { result.name = "QVariantMap"; type = QVariant::Map; + } else if (signature == "a{ss}") { + result.name = "QMap<QString,QString>"; + type = qMetaTypeId<QMap<QString, QString> >(); } else { - result.name = "QDBusRawType::" + signature; + result.name = "{D-Bus type \"" + signature + "\"}"; type = registerComplexDBusType(result.name); } } else { |