--- a/src/dbus/qdbusmarshaller.cpp Mon Jun 21 22:38:13 2010 +0100
+++ b/src/dbus/qdbusmarshaller.cpp Thu Jul 22 16:41:55 2010 +0100
@@ -43,6 +43,8 @@
#include "qdbusmetatype_p.h"
#include "qdbusutil_p.h"
+#ifndef QT_NO_DBUS
+
QT_BEGIN_NAMESPACE
static void qIterAppend(DBusMessageIter *it, QByteArray *ba, int type, const void *arg)
@@ -514,7 +516,7 @@
void* data;
q_dbus_message_iter_get_fixed_array(&sub,&data,&len);
- char signature[2] = { element, 0 };
+ char signature[2] = { char(element), 0 };
q_dbus_message_iter_open_container(&iterator, DBUS_TYPE_ARRAY, signature, &sub);
q_dbus_message_iter_append_fixed_array(&sub, element, &data, len);
q_dbus_message_iter_close_container(&iterator, &sub);
@@ -548,3 +550,5 @@
}
QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS