aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2021-05-04 15:30:42 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-04 17:54:31 +0000
commit650417d9917629f144b8f72405e2e1e002c35551 (patch)
tree79ef69376225e01729b7830a8cc0359763a899a1
parentfb4a9ecd0df954122ad4559570be60934df7e9f2 (diff)
macOS: don't set Qt::StrongFocus on Sliders by default
On macOS, the sliders should not get focus from clicking (Qt::StrongFocus). Instead, it should follow the logic we already do for buttons (which includes checkboxes and radiobuttons), which uses Qt::TabFocus by default. Fixes: QTBUG-93430 Change-Id: I6d0d3d876a0b8c0e9cd9b23f12856090aa6a8173 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit db35ae0a75531b944a9f81d91b60582218fdfbcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quicktemplates2/qquickslider.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index e739fb05..93606eb6 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -272,7 +272,11 @@ QQuickSlider::QQuickSlider(QQuickItem *parent)
: QQuickControl(*(new QQuickSliderPrivate), parent)
{
setActiveFocusOnTab(true);
+#ifdef Q_OS_MACOS
+ setFocusPolicy(Qt::TabFocus);
+#else
setFocusPolicy(Qt::StrongFocus);
+#endif
setAcceptedMouseButtons(Qt::LeftButton);
#if QT_CONFIG(quicktemplates2_multitouch)
setAcceptTouchEvents(true);