diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2017-01-05 16:52:54 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2017-01-19 11:54:27 +0000 |
| commit | 7a8842460dc3c5e4e4ed42e7e2ae5bc619be5c78 (patch) | |
| tree | 8a1c83e05d7d199649a187675b8d29e03246ccb0 /src/quick/items/qquickflickable_p.h | |
| parent | 1d6bdb6ba00a317700ac734b7862983e23c5a842 (diff) | |
Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG
Change-Id: Ibedd0d0c23cf194ea02a229ab643450dbefd40aa
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickflickable_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
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<QQuickItem> 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); |