diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-15 17:08:12 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-15 17:08:12 (GMT) |
| commit | 8e504f4709d15f502ca097f6bf4b27880fd9c6c5 (patch) | |
| tree | 19e49e1271be2b9a41e31f3a9d241ccb70da88b5 /src/dbus | |
| parent | 4896b8a5b16c7f91e026e52906c063af204c34be (diff) | |
| parent | 1bbb6e4db246d7be69a7592e2e700f79d7858d5a (diff) | |
| download | Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.zip Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.tar.gz Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbuspendingcall.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index ef50b04..9c768ed 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -310,7 +310,7 @@ QDBusPendingCall &QDBusPendingCall::operator=(const QDBusPendingCall &other) bool QDBusPendingCall::isFinished() const { - return d && (d->replyMessage.type() != QDBusMessage::InvalidMessage); + return !d || (d->replyMessage.type() != QDBusMessage::InvalidMessage); } void QDBusPendingCall::waitForFinished() diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index b7f54e4..4f90c98 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -188,6 +188,7 @@ public: private: inline void calculateMetaTypes() { + if (!d) return; int typeIds[Count > 0 ? Count : 1]; // use at least one since zero-sized arrays aren't valid ForEach::fillMetaTypes(typeIds); setMetaTypes(Count, typeIds); |