diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-07 14:09:14 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-19 14:53:14 +0000 |
| commit | ccf4878e1f3b54d547f58db13b1fb52ac24e017b (patch) | |
| tree | f3f6fe6cbacb8b28a886f6fb386b0120146ba94f /src/quick | |
| parent | 3fa5a9c0113f381cedb1b9d82d82bdd2289c57c0 (diff) | |
add QDebug operators for QQuickPointerEvent, Point and Device
Change-Id: I25c521856cd6d73daeddacb4ae998e4de9109448
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 51 | ||||
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 5 |
2 files changed, 56 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index c04fbeea6e..d7f5d347ce 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -41,6 +41,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickwindow_p.h> +#include <private/qdebug_p.h> QT_BEGIN_NAMESPACE @@ -738,4 +739,54 @@ QTouchEvent *QQuickPointerEvent::touchEventForItem(const QList<const QQuickEvent return touchEvent; } +#ifndef QT_NO_DEBUG_STREAM + +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerDevice *dev) { + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QQuickPointerDevice("<< dev->name() << ' '; + QtDebugUtils::formatQEnum(dbg, dev->type()); + dbg << ' '; + QtDebugUtils::formatQEnum(dbg, dev->pointerType()); + dbg << " caps:"; + QtDebugUtils::formatQFlags(dbg, dev->capabilities()); + if (dev->type() == QQuickPointerDevice::TouchScreen || + dev->type() == QQuickPointerDevice::TouchPad) + dbg << " maxTouchPoints:" << dev->maximumTouchPoints(); + else + dbg << " buttonCount:" << dev->buttonCount(); + dbg << ')'; + return dbg; +} + +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerEvent *event) { + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QQuickPointerEvent(dev:"; + QtDebugUtils::formatQEnum(dbg, event->device()->type()); + if (event->buttons() != Qt::NoButton) { + dbg << " buttons:"; + QtDebugUtils::formatQEnum(dbg, event->buttons()); + } + dbg << " ["; + int c = event->pointCount(); + for (int i = 0; i < c; ++i) + dbg << event->point(i) << ' '; + dbg << "])"; + return dbg; +} + +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *event) { + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QQuickEventPoint(valid:" << event->isValid() << " accepted:" << event->isAccepted() + << " state:"; + QtDebugUtils::formatQEnum(dbg, event->state()); + dbg << " scenePos:" << event->scenePos() << " id:" << event->pointId() + << " timeHeld:" << event->timeHeld() << ')'; + return dbg; +} + +#endif + QT_END_NAMESPACE diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index ed75556d6a..12022a0f80 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -471,6 +471,11 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::DeviceTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::PointerTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::Capabilities) +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug, const QQuickPointerDevice *); +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug, const QQuickPointerEvent *); +Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug, const QQuickEventPoint *); +//Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug, const QQuickEventTouchPoint *); TODO maybe + QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickKeyEvent) |