diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-08-20 12:40:54 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-08-20 12:40:54 (GMT) |
commit | 2a44538e0f43e93257c6d69d0b86d26219dd7a99 (patch) | |
tree | dc404eeffcc96dc636ec9f0a0c6bad5bbe49d748 /src/corelib/kernel | |
parent | 9842c3f07c0ace5a13aa531a950f316427ed4bb4 (diff) | |
download | Qt-2a44538e0f43e93257c6d69d0b86d26219dd7a99.zip Qt-2a44538e0f43e93257c6d69d0b86d26219dd7a99.tar.gz Qt-2a44538e0f43e93257c6d69d0b86d26219dd7a99.tar.bz2 |
Fix warning and potential infinite recursion.
The code where the infinite recursion could appears should only be
called by code generated by very old version of moc
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 285afed..e874c90 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3223,6 +3223,7 @@ static void blocking_activate(QObject *sender, int signal, QObjectPrivate::Conne */ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv) { + Q_UNUSED(to_signal_index); activate(sender, from_signal_index, argv); } @@ -3370,7 +3371,7 @@ void QMetaObject::activate(QObject *sender, int signal_index, void **argv) const QMetaObject *mo = sender->metaObject(); while (mo && mo->methodOffset() > signal_index) mo = mo->superClass(); - activate(sender, signal_index - mo->methodOffset(), argv); + activate(sender, mo, signal_index - mo->methodOffset(), argv); } /*!\internal |