diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
| commit | 89f8e1f54ff1f7e033f9a9da232bcb4c72b1e45f (patch) | |
| tree | 570a9c7aa1d53b7d38ecb74b856203e19df59c52 /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | 48d24fe2e4d6ce6d91805a3425be0954126acc84 (diff) | |
| parent | d091c75c0b953a8b91c57f075769036bd09ae4c2 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickmenu.cpp
Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 3c9065db..154688b2 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -632,7 +632,7 @@ void QQuickRangeSlider::setTo(qreal to) \li This property holds the value of the first handle in the range \c from - \c to. - If \l to is greater than \l from, the value of the first handle + If \l from is greater than \l to, the value of the first handle must be greater than the second, and vice versa. The default value is \c 0.0. @@ -689,7 +689,7 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const \li This property holds the value of the second handle in the range \c from - \c to. - If \l to is greater than \l from, the value of the first handle + If \l from is greater than \l to, the value of the first handle must be greater than the second, and vice versa. The default value is \c 0.0. |