From 7a8842460dc3c5e4e4ed42e7e2ae5bc619be5c78 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 5 Jan 2017 16:52:54 +0100 Subject: Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG Change-Id: Ibedd0d0c23cf194ea02a229ab643450dbefd40aa Reviewed-by: Shawn Rutledge --- src/quick/items/qquickflickable_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 78c8271525..52cade1472 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -113,8 +113,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem Q_PROPERTY(QQmlListProperty flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") - Q_FLAGS(BoundsBehavior) - public: QQuickFlickable(QQuickItem *parent=0); ~QQuickFlickable(); @@ -129,6 +127,7 @@ public: DragAndOvershootBounds = DragOverBounds | OvershootBounds }; Q_DECLARE_FLAGS(BoundsBehavior, BoundsBehaviorFlag) + Q_FLAG(BoundsBehavior) BoundsBehavior boundsBehavior() const; void setBoundsBehavior(BoundsBehavior); -- cgit v1.2.3