diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-28 06:41:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-28 06:41:26 (GMT) |
| commit | 7f181b6a2992b60a3b0247c0a63c84d486cfbf97 (patch) | |
| tree | 6cea3e4a29bd25eca3a03b51de54318fd925fea1 | |
| parent | 3f74384fd781d6d6028914bb8520340694810a1a (diff) | |
| parent | 77900ebd910635a454b442f04275b8d6db60ab4a (diff) | |
| download | Qt-7f181b6a2992b60a3b0247c0a63c84d486cfbf97.zip Qt-7f181b6a2992b60a3b0247c0a63c84d486cfbf97.tar.gz Qt-7f181b6a2992b60a3b0247c0a63c84d486cfbf97.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix D-Bus marshalling of booleans in optimised code.
| -rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index d732ad0..28cec7d 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -387,7 +387,6 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) switch (*signature) { #ifdef __OPTIMIZE__ case DBUS_TYPE_BYTE: - case DBUS_TYPE_BOOLEAN: case DBUS_TYPE_INT16: case DBUS_TYPE_UINT16: case DBUS_TYPE_INT32: @@ -397,6 +396,9 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) case DBUS_TYPE_DOUBLE: qIterAppend(&iterator, ba, *signature, arg.constData()); return true; + case DBUS_TYPE_BOOLEAN: + append( arg.toBool() ); + return true; #else case DBUS_TYPE_BYTE: append( qvariant_cast<uchar>(arg) ); |