diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-26 17:17:06 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-26 17:17:06 (GMT) |
| commit | 0808d5084c831dd1af259be88d9f2087ca0ae957 (patch) | |
| tree | 16c8d3d362c3f4f7678f77f8dd0da7af91aeddb3 /src/dbus | |
| parent | 1b54b600107e33cfbebaea3b2bd3c7f24385a1a8 (diff) | |
| parent | 67a39e0eb04069e216b76672f45e7709fb076577 (diff) | |
| download | Qt-0808d5084c831dd1af259be88d9f2087ca0ae957.zip Qt-0808d5084c831dd1af259be88d9f2087ca0ae957.tar.gz Qt-0808d5084c831dd1af259be88d9f2087ca0ae957.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Autotest: make the test valid for multiple Qt versions
Cocoa: qfiledialog test spits out memory warnings
Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
Don't use QDebug references. Instead, pass by value.
QNativeSocketEngine: Set OS error strings on failed read()
QNativeSocketEngine: Also handle unknown errors from socket engine
Qt/Cocoa Event Dispatcher Problem in modal dialogs
Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )
'test -e' is a bashism. It's not available in traditional sh.
QFileNetworkReply: Use a QFileEngine
Crash when deleting QMainWindow with native toolbar on Cocoa.
QNativeSocketEngine_win: Don't mess with linger settings
Cosmetic: move the "Alsa support..." line to a more appropriate place
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
fix copy-paste error
minor optimization
...
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusargument.cpp | 1 | ||||
| -rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 3466d90..7defc9a 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -535,7 +535,6 @@ QDBusArgument &QDBusArgument::operator<<(const QByteArray &arg) /*! \internal - Returns the type signature of the D-Bus type this QDBusArgument \since 4.5 Appends the variant \a v. diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index f156e04..8ec328e 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qdbusargument_p.h" +#include "qdbusmetatype_p.h" #include "qdbusutil_p.h" QT_BEGIN_NAMESPACE @@ -167,7 +168,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) QByteArray tmpSignature; const char *signature = 0; - if (int(id) == qMetaTypeId<QDBusArgument>()) { + if (int(id) == QDBusMetaTypeId::argument) { // take the signature from the QDBusArgument object we're marshalling tmpSignature = qvariant_cast<QDBusArgument>(value).currentSignature().toLatin1(); @@ -353,7 +354,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) } // intercept QDBusArgument parameters here - if (id == qMetaTypeId<QDBusArgument>()) { + if (id == QDBusMetaTypeId::argument) { QDBusArgument dbusargument = qvariant_cast<QDBusArgument>(arg); QDBusArgumentPrivate *d = QDBusArgumentPrivate::d(dbusargument); if (!d->message) |