From 2a44538e0f43e93257c6d69d0b86d26219dd7a99 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 20 Aug 2009 14:40:54 +0200 Subject: 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 --- src/corelib/kernel/qobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v0.12