1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blockSignals should block QML signal emission.

Browse Source 
Change-Id: Ief35f3ca326173a87240e3cb558e47f721bd04b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Michael Brasser 2012-08-06 11:52:29 +10:00 committed by Qt by Nokia
parent ac2b452616
commit 8e7b86de2c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qobject.cpp
View File

@ -3325,13 +3325,13 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
if (!sender->d_func()->isSignalConnected(signal_index)) if (!sender->d_func()->isSignalConnected(signal_index))
return; // nothing connected to these signals, and no spy return; // nothing connected to these signals, and no spy
if (sender->d_func()->blockSig)
return;
if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted) if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted)
QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender,
signal_index, argv); signal_index, argv);
if (sender->d_func()->blockSig)
return;
void *empty_argv[] = { 0 }; void *empty_argv[] = { 0 };
if (qt_signal_spy_callback_set.signal_begin_callback != 0) { if (qt_signal_spy_callback_set.signal_begin_callback != 0) {
qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index,