diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
| commit | 9393d6b459d02a8508750a846bf97a69e48c97e2 (patch) | |
| tree | 4cf83534dc0ea77ce63819b0358f6f72820db9bc /qt/qdbusmarshall.cpp | |
| parent | 305ce15e4f0568d5eeb8ca169c4fb0f77e50fcb4 (diff) | |
2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/*:
* dbus/qdbus.h: Sync with KDE Subversion revision 516237. This
represents the first feature-complete version of the Qt4
bindings since I took ove maintainership.
Diffstat (limited to 'qt/qdbusmarshall.cpp')
| -rw-r--r-- | qt/qdbusmarshall.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qt/qdbusmarshall.cpp b/qt/qdbusmarshall.cpp index 19de0d91..eb9493b7 100644 --- a/qt/qdbusmarshall.cpp +++ b/qt/qdbusmarshall.cpp @@ -22,7 +22,7 @@ * */ -#include "qdbusmarshall.h" +#include "qdbusmarshall_p.h" #include "qdbustype.h" #include "qdbusvariant.h" @@ -349,8 +349,10 @@ static void qAppendVariantToMessage(DBusMessageIter *it, const QDBusType & /* ty } else { v = var; - t = QDBusType::guessFromVariant(v); } + + if (!t.isValid()) + t = QDBusType::guessFromVariant(v); // now add this variant DBusMessageIter sub; |