diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
commit | c39b126a77e27296ef82a1634753c775cc5a93fb (patch) | |
tree | 235d9568e21e59b7c70f8be81518c3ea184cf552 /src/quicktemplates2/qquickswipeview_p.h | |
parent | dc2603562a36241c9beac0c9c4c08bcbfed7b6a2 (diff) | |
parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickrangeslider_p.h
src/quicktemplates2/qquickswipeview_p.h
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextfield_p.h
Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
Diffstat (limited to 'src/quicktemplates2/qquickswipeview_p.h')
-rw-r--r-- | src/quicktemplates2/qquickswipeview_p.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h index 543cb6aa..82db6457 100644 --- a/src/quicktemplates2/qquickswipeview_p.h +++ b/src/quicktemplates2/qquickswipeview_p.h @@ -58,7 +58,9 @@ class QQuickSwipeViewPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeView : public QQuickContainer { Q_OBJECT + // 2.1 (Qt 5.8) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL REVISION 1) + // 2.2 (Qt 5.9) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL REVISION 2) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) @@ -66,19 +68,23 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeView : public QQuickContainer public: explicit QQuickSwipeView(QQuickItem *parent = nullptr); + static QQuickSwipeViewAttached *qmlAttachedProperties(QObject *object); + + // 2.1 (Qt 5.8) bool isInteractive() const; void setInteractive(bool interactive); + // 2.2 (Qt 5.9) Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); bool isHorizontal() const; bool isVertical() const; - static QQuickSwipeViewAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: + // 2.1 (Qt 5.8) Q_REVISION(1) void interactiveChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void orientationChanged(); protected: @@ -103,25 +109,29 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeViewAttached : public QObject Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY isCurrentItemChanged FINAL) + Q_PROPERTY(QQuickSwipeView *view READ view NOTIFY viewChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool isNextItem READ isNextItem NOTIFY isNextItemChanged FINAL REVISION 1) Q_PROPERTY(bool isPreviousItem READ isPreviousItem NOTIFY isPreviousItemChanged FINAL REVISION 1) - Q_PROPERTY(QQuickSwipeView *view READ view NOTIFY viewChanged FINAL) public: explicit QQuickSwipeViewAttached(QObject *parent = nullptr); int index() const; bool isCurrentItem() const; + QQuickSwipeView *view() const; + + // 2.1 (Qt 5.8) bool isNextItem() const; bool isPreviousItem() const; - QQuickSwipeView *view() const; Q_SIGNALS: void indexChanged(); void isCurrentItemChanged(); + void viewChanged(); + // 2.1 (Qt 5.8) /*Q_REVISION(1)*/ void isNextItemChanged(); /*Q_REVISION(1)*/ void isPreviousItemChanged(); - void viewChanged(); private: Q_DISABLE_COPY(QQuickSwipeViewAttached) |