diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-08 16:53:05 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-08 16:53:05 (GMT) |
| commit | 89421331366ac1d34ff18bcd40f3e78f7fa1883e (patch) | |
| tree | de41e6f56c257295d81a88fdaaae638ba0d32e09 /src | |
| parent | 5c05470ea96dcb25deb21a64eddffcb2d4ff6fcf (diff) | |
| download | Qt-89421331366ac1d34ff18bcd40f3e78f7fa1883e.zip Qt-89421331366ac1d34ff18bcd40f3e78f7fa1883e.tar.gz Qt-89421331366ac1d34ff18bcd40f3e78f7fa1883e.tar.bz2 | |
Fix annotations added for complex types in signals.
Signals are badly mishandled in QtDBus. In the spec, they are "in"
arguments, but we generate "Out" annotations for them. What's worse,
we were using the wrong count.
QTBUG-914 is about fixing the directionality. While that task isn't
fixed, at least use the right count.
Task-number: QTBUG-5563
Reviewed-by: TrustMe
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 9870584..380b949 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -203,7 +203,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method const char *typeName = QVariant::typeToName( QVariant::Type(types.at(j)) ); xml += QString::fromLatin1(" <annotation name=\"com.trolltech.QtDBus.QtTypeName.%1%2\" value=\"%3\"/>\n") .arg(isOutput ? QLatin1String("Out") : QLatin1String("In")) - .arg(isOutput ? j - inputCount : j - 1) + .arg(isOutput && !isSignal ? j - inputCount : j - 1) .arg(typeNameToXml(typeName)); } } |