diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
| commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
| tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /src/quicktemplates2/qquickscrollbar.cpp | |
| parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index 128bca6f..0c96cb64 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -460,7 +460,7 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation) } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty enumeration QtQuick.Controls::ScrollBar::snapMode This property holds the snap mode. @@ -500,7 +500,7 @@ void QQuickScrollBar::setSnapMode(SnapMode mode) } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty bool QtQuick.Controls::ScrollBar::interactive This property holds whether the scroll bar is interactive. The default value is \c true. @@ -530,7 +530,7 @@ void QQuickScrollBar::resetInteractive() } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty enumeration QtQuick.Controls::ScrollBar::policy This property holds the policy of the scroll bar. The default policy is \c ScrollBar.AsNeeded. |