From 9393d6b459d02a8508750a846bf97a69e48c97e2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Mar 2006 14:29:39 +0000 Subject: 2006-03-06 Thiago Macieira * 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. --- qt/qdbusmarshall.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qt/qdbusmarshall.cpp') 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; -- cgit