summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-08-06 11:52:29 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-26 11:08:42 +0200
commit8e7b86de2c69c9c48c8431bf6ea9e6b0b29f00f8 (patch)
tree43b719d87101c461242d1ddf88fbe33ead4627c9
parentac2b452616796c9dd9c0f0bb63dccbefeb8bacbc (diff)
blockSignals should block QML signal emission.
Change-Id: Ief35f3ca326173a87240e3cb558e47f721bd04b7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
-rw-r--r--src/corelib/kernel/qobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 0298e53368..84c4653999 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3325,13 +3325,13 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
if (!sender->d_func()->isSignalConnected(signal_index))
return; // nothing connected to these signals, and no spy
+ if (sender->d_func()->blockSig)
+ return;
+
if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted)
QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender,
signal_index, argv);
- if (sender->d_func()->blockSig)
- return;
-
void *empty_argv[] = { 0 };
if (qt_signal_spy_callback_set.signal_begin_callback != 0) {
qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index,