diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-05-21 18:20:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 10:50:49 +0200 |
| commit | d2a460d35d6dbcdf3ea87bd116769780650e6e64 (patch) | |
| tree | f8f620311c07e0882b5e38d6229ac1316ff24680 /src/qdbus/qdbusviewer/qdbusviewer.cpp | |
| parent | cbc05ab5c065feca768b6059fb3d758c895e860b (diff) | |
Prefer QMetaType over QVariant during a type information query.
As a side effect the patch probably fix special case, when an interface
wants a variant and one of the parameters has to be converted. Before
QVariant::nameToType was returning only builtin types ids.
Change-Id: I473a9bcbd9249acf7c232492fa62c53de3ff5c71
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/qdbus/qdbusviewer/qdbusviewer.cpp')
| -rw-r--r-- | src/qdbus/qdbusviewer/qdbusviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index a80d4cf22..b8a6d2b68 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -243,7 +243,7 @@ static QString getDbusSignature(const QMetaMethod& method) // create a D-Bus type signature from QMetaMethod's parameters QString sig; for (int i = 0; i < method.parameterTypes().count(); ++i) { - QVariant::Type type = QVariant::nameToType(method.parameterTypes().at(i)); + int type = QMetaType::type(method.parameterTypes().at(i)); sig.append(QString::fromLatin1(QDBusMetaType::typeToSignature(type))); } return sig; @@ -280,9 +280,9 @@ void QDBusViewer::callMethod(const BusSignature &sig) if (paramType.endsWith('&')) continue; // ignore OUT parameters - QVariant::Type type = QVariant::nameToType(paramType); + int type = QMetaType::type(paramType); dialog.addProperty(QString::fromLatin1(paramNames.value(i)), type); - types.append(QMetaType::type(paramType)); + types.append(type); } if (!types.isEmpty()) { |