Merge "Merge remote-tracking branch 'origin/dev' into 5.11" into refs/staging/5.11

1 files changed, 36 insertions, 0 deletions

diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index 0850228ee5..b2d968c046 100644
--- a/src/gui/kernel/qstylehints.cpp
+++ b/src/gui/kernel/qstylehints.cpp
@@ -79,6 +79,7 @@ public:
         , m_tabFocusBehavior(-1)
         , m_uiEffects(-1)
         , m_wheelScrollLines(-1)
+        , m_mouseQuickSelectionThreshold(-1)
         {}
 
     int m_mouseDoubleClickInterval;
@@ -90,6 +91,7 @@ public:
     int m_tabFocusBehavior;
     int m_uiEffects;
     int m_wheelScrollLines;
+    int m_mouseQuickSelectionThreshold;
 };
 
 /*!
@@ -537,4 +539,38 @@ void QStyleHints::setWheelScrollLines(int scrollLines)
     emit wheelScrollLinesChanged(scrollLines);
 }
 
+/*!
+    Sets the mouse quick selection threshold.
+    \internal
+    \sa mouseQuickSelectionThreshold()
+    \since 5.11
+*/
+void QStyleHints::setMouseQuickSelectionThreshold(int threshold)
+{
+    Q_D(QStyleHints);
+    if (d->m_mouseQuickSelectionThreshold == threshold)
+        return;
+    d->m_mouseQuickSelectionThreshold = threshold;
+    emit mouseDoubleClickIntervalChanged(threshold);
+}
+
+/*!
+    \property QStyleHints::mouseQuickSelectionThreshold
+    \brief Quick selection mouse threshold in QLineEdit.
+
+    This property defines how much the mouse cursor should be moved along the y axis
+    to trigger a quick selection during a normal QLineEdit text selection.
+
+    If the property value is less than or equal to 0, the quick selection feature is disabled.
+
+    \since 5.11
+*/
+int QStyleHints::mouseQuickSelectionThreshold() const
+{
+    Q_D(const QStyleHints);
+    if (d->m_mouseQuickSelectionThreshold >= 0)
+        return d->m_mouseQuickSelectionThreshold;
+    return themeableHint(QPlatformTheme::MouseQuickSelectionThreshold, QPlatformIntegration::MouseQuickSelectionThreshold).toInt();
+}
+
 QT_END_NAMESPACE