diff options
author | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
commit | 7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch) | |
tree | e60229477bc8269cf14904620bf0fc5ad18ef6d0 /src/dbus/qdbusabstractinterface.cpp | |
parent | f8c9314d6224948c28487e291b4cdad0049682c7 (diff) | |
parent | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff) | |
download | Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
-rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 4e9c1ad..0ea8c8d 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -560,7 +560,7 @@ void QDBusAbstractInterface::connectNotify(const char *signal) if (!d->isValid) return; - // we end up recursing here, so optimise away + // we end up recursing here, so optimize away if (qstrcmp(signal + 1, "destroyed(QObject*)") == 0) return; |