diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-06-04 19:24:49 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-06-04 19:24:49 +0200 |
| commit | 5c17f3abe1c43539db613da78414bc0b27928814 (patch) | |
| tree | aeda95c710a5dd597d4e45a94f57729f0dc1a6dc /src/dbus | |
| parent | b70c535fb096652def0c4f6df6f9cd2827fa9c97 (diff) | |
| parent | 398c022e8adefc6e71a6048da40c19f6169be831 (diff) | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 19f0b04bc8..96dcd3b2e9 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -161,7 +161,6 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message) // not ok; q_dbus_message_unref(msg); - Q_ASSERT(false); return 0; } |