diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/dbus/qdbusintegrator.cpp | |
parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index c7538c3db5..748658db82 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1988,7 +1988,7 @@ void QDBusConnectionPrivate::connectSignal(const QString &key, const SignalHook { signalHooks.insertMulti(key, hook); connect(hook.obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)), - Qt::DirectConnection); + Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection)); MatchRefCountHash::iterator it = matchRefCounts.find(hook.matchRule); |