diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
| commit | 0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch) | |
| tree | 28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/quick/items/qquickevents.cpp | |
| parent | 12a3eff085bc7eb30a5283e32009d2899b464278 (diff) | |
| parent | a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff) | |
Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler
We no longer have any hope of getting this into 5.8.
Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 672aadd0e3..1fd9014408 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -1038,7 +1038,7 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *eve dbg << "QQuickEventPoint(valid:" << event->isValid() << " accepted:" << event->isAccepted() << " state:"; QtDebugUtils::formatQEnum(dbg, event->state()); - dbg << " scenePos:" << event->scenePos() << " id:" << event->pointId() + dbg << " scenePos:" << event->scenePos() << " id:" << hex << event->pointId() << dec << " timeHeld:" << event->timeHeld() << ')'; return dbg; } |