diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
| commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
| tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/quicktemplates2/qquickscrollbar_p.h | |
| parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
| parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 1ac1d306..8f0b835d 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -64,9 +64,11 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged FINAL) Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL REVISION 2) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive RESET resetInteractive NOTIFY interactiveChanged FINAL REVISION 2) Q_PROPERTY(Policy policy READ policy WRITE setPolicy NOTIFY policyChanged FINAL REVISION 2) + // 2.3 (Qt 5.10) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(qreal minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged FINAL REVISION 4) @@ -93,6 +95,7 @@ public: Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); + // 2.2 (Qt 5.9) enum SnapMode { NoSnap, SnapAlways, @@ -117,6 +120,7 @@ public: Policy policy() const; void setPolicy(Policy policy); + // 2.3 (Qt 5.10) bool isHorizontal() const; bool isVertical() const; @@ -139,6 +143,7 @@ Q_SIGNALS: void activeChanged(); void pressedChanged(); void orientationChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void snapModeChanged(); Q_REVISION(2) void interactiveChanged(); Q_REVISION(2) void policyChanged(); |