Make QTouchDevice a Q_GADGET and introduce Q_ENUM/Q_FLAG.

Make it possible to stream the enumerations to a debug stream.#

Change-Id: I0add2dcd835333a8d6cebf779252f22c1418faf3
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2015-05-21 12:22:45 +02:00
parent 6794319bbd
commit 97e75b2763

View File

@ -43,11 +43,13 @@ class QTouchDevicePrivate;
class Q_GUI_EXPORT QTouchDevice class Q_GUI_EXPORT QTouchDevice
{ {
Q_GADGET
public: public:
enum DeviceType { enum DeviceType {
TouchScreen, TouchScreen,
TouchPad TouchPad
}; };
Q_ENUM(DeviceType)
enum CapabilityFlag { enum CapabilityFlag {
Position = 0x0001, Position = 0x0001,
@ -58,6 +60,7 @@ public:
NormalizedPosition = 0x0020, NormalizedPosition = 0x0020,
MouseEmulation = 0x0040 MouseEmulation = 0x0040
}; };
Q_FLAG(CapabilityFlag)
Q_DECLARE_FLAGS(Capabilities, CapabilityFlag) Q_DECLARE_FLAGS(Capabilities, CapabilityFlag)
QTouchDevice(); QTouchDevice();