diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 06:44:45 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 06:44:45 +0200 |
commit | 5ab01d7dc4b5a5d180885e3bc2a82267f9fcf3ae (patch) | |
tree | 6f2b46092fb6909e486864924f15e3c629a53123 /src | |
parent | 4cda4427b6a2e07dd406362cf7b643b971706b2c (diff) | |
parent | 0689a8256c0a21087c01fff3998fd3b606a5ac4c (diff) | |
download | qtquickcontrols-5ab01d7dc4b5a5d180885e3bc2a82267f9fcf3ae.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I00b66b03717563bb700f8a73c3bc295a55ac8c6a
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/Slider.qml | 4 | ||||
-rw-r--r-- | src/controls/SpinBox.qml | 6 | ||||
-rw-r--r-- | src/dialogs/qquickplatformfiledialog.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index e290640e..07ad74c4 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -331,14 +331,14 @@ Control { onVerticalWheelMoved: { if (verticalDelta !== 0) { var delta = Math.abs(verticalDelta)*step > stepSize ? verticalDelta*step : verticalDelta/Math.abs(verticalDelta)*stepSize - value -= delta * (inverted ? 1 : -1) + range.position = range.positionForValue(value - delta * (inverted ? 1 : -1)) } } onHorizontalWheelMoved: { if (horizontalDelta !== 0) { var delta = Math.abs(horizontalDelta)*step > stepSize ? horizontalDelta*step : horizontalDelta/Math.abs(horizontalDelta)*stepSize - value += delta * (inverted ? 1 : -1) + range.position = range.positionForValue(value + delta * (inverted ? 1 : -1)) } } } diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index a742abd6..b7ec6a8f 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -359,8 +359,9 @@ Control { property bool autoincrement: false; onReleased: autoincrement = false + onExited: autoincrement = false Timer { running: mouseUp.pressed; interval: 350 ; onTriggered: mouseUp.autoincrement = true } - Timer { running: mouseUp.autoincrement; interval: 60 ; repeat: true ; onTriggered: __increment() } + Timer { running: mouseUp.autoincrement && mouseUp.containsMouse; interval: 60 ; repeat: true ; onTriggered: __increment() } } // Spinbox decrement button @@ -386,8 +387,9 @@ Control { property bool autoincrement: false; onReleased: autoincrement = false + onExited: autoincrement = false Timer { running: mouseDown.pressed; interval: 350 ; onTriggered: mouseDown.autoincrement = true } - Timer { running: mouseDown.autoincrement; interval: 60 ; repeat: true ; onTriggered: __decrement() } + Timer { running: mouseDown.autoincrement && mouseDown.containsMouse; interval: 60 ; repeat: true ; onTriggered: __decrement() } } Keys.onUpPressed: __increment() diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index aaf15197..1a969e15 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -318,7 +318,9 @@ void QQuickPlatformFileDialog1::accept() {shortcuts.pictures}, a native image picker dialog will be used for accessing the user's photo album. The URL returned can be set as \l{Image::source}{source} for \l{Image}. - This feature was added in Qt 5.5. + For this to be enabled, the Info.plist assigned to QMAKE_INFO_PLIST in the project file must + contain the key, NSPhotoLibraryUsageDescription. See Info.plist documentation from Apple for + more information regarding this key. This feature was added in Qt 5.5. \sa shortcuts */ |