diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 09:41:06 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 09:41:06 +0200 |
| commit | 12ebfedc3de64e99082ca573351bdd24b1d42370 (patch) | |
| tree | 0290b22723ae07fb4b11e6f5008e5bae2050a12b /src/gui/kernel/qevent.cpp | |
| parent | 7ffe42d376b574239480b38b8f6430339b806daa (diff) | |
| parent | baec0ecd314c6e9563bd56cf19571ca71d7d11cd (diff) | |
| download | qt4-tools-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/kernel/qcoreevent.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index d616e5eeca..53010e11e5 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3083,7 +3083,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { << ", " << me->button() << ", " << hex << (int)me->buttons() << ", " << hex << (int)me->modifiers() - << ")"; + << ')'; } return dbg.space(); @@ -3104,7 +3104,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { #ifndef QT_NO_WHEELEVENT case QEvent::Wheel: dbg.nospace() << "QWheelEvent(" << static_cast<const QWheelEvent *>(e)->delta() - << ")"; + << ')'; return dbg.space(); #endif case QEvent::KeyPress: @@ -3130,7 +3130,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { << ", \"" << ke->text() << "\", " << ke->isAutoRepeat() << ", " << ke->count() - << ")"; + << ')'; } return dbg.space(); case QEvent::FocusIn: |