diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-13 14:28:58 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-13 14:28:58 +0200 |
| commit | 02ff2973ceeef00ced4468b6e15cfadd9f021b0d (patch) | |
| tree | e5b51329fceb3d0134e533e41c0f3800549f1786 /src/gui/kernel/qcursor.cpp | |
| parent | c5b743472fc36986cf34636dbcb73a0d0fa6b9e6 (diff) | |
| parent | 16c32710bc8a5ecefc833352159361be564f3fe4 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into dev-highdpi
Conflicts:
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ib7f277957636186d0abd58d8c710392ef7b02e13
Diffstat (limited to 'src/gui/kernel/qcursor.cpp')
| -rw-r--r-- | src/gui/kernel/qcursor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index e6bf2b0be9..547c32b2b4 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -602,8 +602,9 @@ QCursor::operator QVariant() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QCursor &c) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QCursor(Qt::CursorShape(" << c.shape() << "))"; - return dbg.space(); + return dbg; } #endif |