diff options
| -rw-r--r-- | src/controls/ScrollView.qml | 4 | ||||
| -rw-r--r-- | src/controls/Slider.qml | 10 | ||||
| -rw-r--r-- | src/experimental/Dial.qml | 4 | ||||
| -rw-r--r-- | src/layouts/qquicklinearlayout.cpp | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 19cdee96..01b9cd3c 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -207,8 +207,8 @@ FocusScope { property int acceleration: 40 property int flickThreshold: 20 - property double speedThreshold: 3 - property double ignored: 0.001 // ## flick() does not work with 0 yVelocity + property real speedThreshold: 3 + property real ignored: 0.001 // ## flick() does not work with 0 yVelocity property int maxFlick: 400 property bool horizontalRecursionGuard: false diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 3ccf4a64..0493d934 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -75,7 +75,7 @@ Control { property int orientation: Qt.Horizontal /*! - \qmlproperty double Slider::minimumValue + \qmlproperty real Slider::minimumValue This property holds the minimum value of the Slider. The default value is \c{0.0}. @@ -83,7 +83,7 @@ Control { property alias minimumValue: range.minimumValue /*! - \qmlproperty double Slider::maximumValue + \qmlproperty real Slider::maximumValue This property holds the maximum value of the Slider The default value is \c{1.0}. @@ -110,7 +110,7 @@ Control { property alias pressed: mouseArea.pressed /*! - \qmlproperty double Slider::stepSize + \qmlproperty real Slider::stepSize This property indicates the slider step size. @@ -132,7 +132,7 @@ Control { property alias stepSize: range.stepSize /*! - \qmlproperty double Slider::value + \qmlproperty real Slider::value This property holds the current value of the Slider. The default value is \c{0.0}. @@ -264,7 +264,7 @@ Control { horizontalMaximumValue: slider.maximumValue verticalMinimumValue: slider.minimumValue verticalMaximumValue: slider.maximumValue - property double step: (slider.maximumValue - slider.minimumValue)/(range.positionAtMaximum - range.positionAtMinimum) + property real step: (slider.maximumValue - slider.minimumValue)/(range.positionAtMaximum - range.positionAtMinimum) onVerticalWheelMoved: { if (verticalDelta !== 0) { diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml index 2206f623..bbb7fcbc 100644 --- a/src/experimental/Dial.qml +++ b/src/experimental/Dial.qml @@ -138,7 +138,7 @@ Item { enabled: dial.enabled step: range.stepSize * 100 activeControl: tickmarksEnabled ? "tick" : "" - property double visualPos : range.value + property real visualPos : range.value Behavior on visualPos { enabled: !mouseArea.inDrag @@ -155,7 +155,7 @@ Item { // horizontalMaximumValue: dial.maximumValue // verticalMinimumValue: dial.minimumValue // verticalMaximumValue: dial.maximumValue -// property double step: (dial.maximumValue - dial.minimumValue)/100 +// property real step: (dial.maximumValue - dial.minimumValue)/100 // onVerticalWheelMoved: { // value += verticalDelta/4*step diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp index fc8dc707..c3e01d6c 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -393,7 +393,7 @@ QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/) } /*! - \qmlproperty double GridLayout::columnSpacing + \qmlproperty real GridLayout::columnSpacing This property holds the spacing between each column. The default value is \c 4. @@ -416,7 +416,7 @@ void QQuickGridLayout::setColumnSpacing(qreal spacing) } /*! - \qmlproperty double GridLayout::rowSpacing + \qmlproperty real GridLayout::rowSpacing This property holds the spacing between each row. The default value is \c 4. @@ -649,13 +649,13 @@ QQuickLinearLayout::QQuickLinearLayout(Qt::Orientation orientation, } /*! - \qmlproperty double RowLayout::spacing + \qmlproperty real RowLayout::spacing This property holds the spacing between each cell. The default value is \c 4. */ /*! - \qmlproperty double ColumnLayout::spacing + \qmlproperty real ColumnLayout::spacing This property holds the spacing between each cell. The default value is \c 4. |