diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-11 07:05:17 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-11 07:05:17 (GMT) |
| commit | feb1351592b55b2a97db737b91f301b69f42cdc9 (patch) | |
| tree | 8cdbb3f72ff1a45300c4d098324daa6ea9d7cbe9 /src/corelib | |
| parent | ebefcd1c0d4286a58bea2b4859d471df07f1f013 (diff) | |
| parent | 02df785c9d95cdafe47a087d29a25f08bfb9e387 (diff) | |
| download | Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.zip Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.tar.gz Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 32047a0..b4e3959 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3711,7 +3711,7 @@ void QObject::dumpObjectInfo() offsetToNextMetaObject = signalOffset; computeOffsets(mo, &signalOffset, &methodOffset); } - offset = offset - signalOffset + methodOffset; + offset = methodOffset - signalOffset; } const QMetaMethod signal = metaObject()->method(signal_index + offset); qDebug(" signal: %s", signal.signature()); |