diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-29 21:14:32 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-29 21:14:32 +1000 |
commit | 7b18baf23b1e8c663872b2b25b1323798b1d09df (patch) | |
tree | 6d8d6a1f67e955da6816ce606888ef2fa8cfc932 /src/dbus/qdbusargument.cpp | |
parent | 53f16164661f8692aef9bd941b92697a047c0f4c (diff) | |
parent | 6d8f350808d36aac807cd55eafc447e80af671ad (diff) | |
download | qt4-tools-7b18baf23b1e8c663872b2b25b1323798b1d09df.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Unix configure: Add support for --sysroot
Add a 'capabilities' flag to the marshaller and demarshaller
Add a set of connection capabilities to QDBusConnection
Move the main D-Bus session and system connections to the main thread
Add a way to obtain the DBusConnection* pointer from a QDBusConnection
Make the QIconvCodec on Unix not enforce the Latin1 codec.
Diffstat (limited to 'src/dbus/qdbusargument.cpp')
-rw-r--r-- | src/dbus/qdbusargument.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 00f49ba916..09f0e8238f 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -72,7 +72,7 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) return ""; QByteArray signature; - QDBusMarshaller *marshaller = new QDBusMarshaller; + QDBusMarshaller *marshaller = new QDBusMarshaller(0); marshaller->ba = &signature; // run it @@ -114,7 +114,7 @@ bool QDBusArgumentPrivate::checkWrite(QDBusArgumentPrivate *&d) return false; if (d->message && d->ref != 1) { - QDBusMarshaller *dd = new QDBusMarshaller; + QDBusMarshaller *dd = new QDBusMarshaller(d->capabilities); dd->message = q_dbus_message_copy(d->message); q_dbus_message_iter_init_append(dd->message, &dd->iterator); @@ -157,7 +157,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) if (d->ref == 1) return true; // no need to detach - QDBusDemarshaller *dd = new QDBusDemarshaller; + QDBusDemarshaller *dd = new QDBusDemarshaller(d->capabilities); dd->message = q_dbus_message_ref(d->message); dd->iterator = static_cast<QDBusDemarshaller*>(d)->iterator; @@ -295,7 +295,7 @@ QDBusArgument::QDBusArgument() return; } - QDBusMarshaller *dd = new QDBusMarshaller; + QDBusMarshaller *dd = new QDBusMarshaller(0); d = dd; // create a new message with any type, we won't sent it anyways |