diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-08-20 12:32:31 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-08-20 12:35:50 (GMT) |
| commit | 9842c3f07c0ace5a13aa531a950f316427ed4bb4 (patch) | |
| tree | e9a3be4d62cf95e7561b18abe94897401e8791d5 /src/corelib | |
| parent | 18eccf4189f4a093fb7d2418a1f3518da971aefa (diff) | |
| download | Qt-9842c3f07c0ace5a13aa531a950f316427ed4bb4.zip Qt-9842c3f07c0ace5a13aa531a950f316427ed4bb4.tar.gz Qt-9842c3f07c0ace5a13aa531a950f316427ed4bb4.tar.bz2 | |
Fix potential Infinite recurstion.
Was introduced by commit 919b723
This function is not even supposed to be called anymore by anything
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 022ae13..285afed 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3219,12 +3219,11 @@ static void blocking_activate(QObject *sender, int signal, QObjectPrivate::Conne /*!\internal \obsolete. - Used to be called from QMetaObject::activate(QObject *, QMetaObject *, int, int, void **) + Used to be called from QMetaObject::activate(QObject *, QMetaObject *, int, int, void **) before Qt 4.6 */ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv) { - int offset = sender->metaObject()->methodOffset(); - activate(sender, from_signal_index - offset, to_signal_index - offset, argv); + activate(sender, from_signal_index, argv); } /*!\internal |