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/qquickslider.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/qquickslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickslider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 2e337c3a..671a9ef7 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE */ /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlsignal QtQuick.Controls::Slider::moved() This signal is emitted when the slider has been interactively moved @@ -430,7 +430,7 @@ void QQuickSlider::setSnapMode(SnapMode mode) } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty bool QtQuick.Controls::Slider::live This property holds whether the slider provides live updates for the \l value @@ -562,7 +562,7 @@ void QQuickSlider::setHandle(QQuickItem *handle) } /*! - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) \qmlmethod real QtQuick.Controls::Slider::valueAt(real position) Returns the value for the given \a position. |