diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-12 12:46:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-12 12:46:42 (GMT) |
| commit | d1c5cfe2988daa61d74226f7d4df11b87efce429 (patch) | |
| tree | 11a5eb7106300aa0caf84447cbac6fc6b40b2974 /src/dbus | |
| parent | 1618a06367f4282b0eb308b4ba1acbcdc609689b (diff) | |
| parent | 98fb861cf4611f9cada3d80ef93647669dfad165 (diff) | |
| download | Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.zip Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.tar.gz Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 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 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; } |