summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-06-04 17:24:49 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-06-04 17:24:49 (GMT)
commit5c17f3abe1c43539db613da78414bc0b27928814 (patch)
treeaeda95c710a5dd597d4e45a94f57729f0dc1a6dc /src/dbus
parentb70c535fb096652def0c4f6df6f9cd2827fa9c97 (diff)
parent398c022e8adefc6e71a6048da40c19f6169be831 (diff)
downloadQt-5c17f3abe1c43539db613da78414bc0b27928814.zip
Qt-5c17f3abe1c43539db613da78414bc0b27928814.tar.gz
Qt-5c17f3abe1c43539db613da78414bc0b27928814.tar.bz2
Merge commit 'origin/4.5'
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusmessage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 19f0b04..96dcd3b 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;
}