git.iko.soy/unity8
on xenial help sign in
Q_FLAGS -> Q_FLAG
99f24d8Albert Astals Cid
plugins/Unity/InputInfo/qinputinfo.h+2−2
compare with xenial
unifiedsplit
@@ -57,7 +57,6 @@ class QInputDeviceManager;
57class QInputDevice : public QObject
57class QInputDevice : public QObject
58{
58{
59 Q_OBJECT
59 Q_OBJECT
60− Q_FLAGS(InputType InputTypeFlags)
61 friend class QInputDeviceManagerPrivate;
60 friend class QInputDeviceManagerPrivate;
62
61
63public:
62public:
@@ -71,8 +70,9 @@ public:
71 Keyboard = 16,
70 Keyboard = 16,
72 Switch = 32
71 Switch = 32
73 };
72 };
74− Q_ENUM(InputType)
73+ Q_FLAG(InputType)
75 Q_DECLARE_FLAGS(InputTypeFlags, InputType)
74 Q_DECLARE_FLAGS(InputTypeFlags, InputType)
75+ Q_FLAG(InputTypeFlags)
76
76
77 explicit QInputDevice(QObject *parent = 0);
77 explicit QInputDevice(QObject *parent = 0);
78 QString name() const;
78 QString name() const;