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/qquickscrollbar_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/qquickscrollbar_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 9b417a2b..b4a92d0a 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -64,6 +64,7 @@ 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) @@ -90,6 +91,7 @@ public: Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); + // 2.2 (Qt 5.9) enum SnapMode { NoSnap, SnapAlways, @@ -130,6 +132,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(); |