diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 15:08:15 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 15:08:15 (GMT) |
| commit | d8f65a7f0707d8a97801ad20d690672e0124b491 (patch) | |
| tree | 0c881ac70d9063044ca1ca09290d0747bf322693 /src/corelib/kernel/qobject.cpp | |
| parent | 9683cf068c3f933f836dc2a5b4a19b1c2f86d38a (diff) | |
| parent | 747444c6776d948dad479e7b6f3564d0515d4e52 (diff) | |
| download | Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.zip Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.tar.gz Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -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 a095e0a..55d70c1 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3440,7 +3440,7 @@ void QObject::dumpObjectInfo() qDebug(" SIGNALS IN"); if (d->senders) { - for (QObjectPrivate::Connection *s = d->senders; s; s = s->next) + for (QObjectPrivate::Connection *s = d->senders; s; s = s->next) { const QMetaMethod slot = metaObject()->method(s->method); qDebug(" <-- %s::%s %s", s->sender->metaObject()->className(), |