11 files changed, 25 insertions, 22 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 7c336d05b..9ebcadf5d 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -106,7 +106,9 @@ Control {
     readonly property alias selectedText: popup.selectedText
 
     readonly property bool pressed: mouseArea.pressed || popup.popupVisible
-    property alias containsMouse: mouseArea.containsMouse
+
+    /* \internal */
+    property alias __containsMouse: mouseArea.containsMouse
 
     style: Qt.createComponent(Settings.THEME_PATH + "/ComboBoxStyle.qml", comboBox)
 
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 78798da8f..6f080beae 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -143,9 +143,6 @@ Control {
     */
     property alias value: range.value
 
-    /*! \internal */
-    property bool containsMouse: mouseArea.containsMouse
-
     /*!
         \qmlproperty bool Slider::activeFocusOnPress
 
@@ -167,6 +164,9 @@ Control {
     /*! \internal */
     property string tickPosition: "Below" // "Above", "Below", "BothSides"
 
+    /*! \internal */
+    property bool __containsMouse: mouseArea.containsMouse
+
     Accessible.role: Accessible.Slider
     Accessible.name: value
 
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index 387796ac6..074b302e4 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -117,7 +117,6 @@ Item {
         \li int \c handleIndex - specifies the index of the splitter handle. The handle
                                  between the first and the second item will get index 0,
                                  the next handle index 1 etc.
-        \li bool \c containsMouse - the mouse hovers the handle.
         \li bool \c pressed: the handle is being pressed.
         \li bool \c dragged: the handle is being dragged.
         \endlist
diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml
index a0b7c779f..2cbc15e1b 100644
--- a/src/experimental/Dial.qml
+++ b/src/experimental/Dial.qml
@@ -55,7 +55,6 @@ Item {
 
     property alias maximumValue: range.maximumValue
     property alias minimumValue: range.minimumValue
-    property alias containsMouse: mouseArea.containsMouse
     property alias value: range.value
     property alias stepSize: range.stepSize
 
@@ -63,6 +62,9 @@ Item {
     property bool tickmarksEnabled: false
     property bool activeFocusOnPress: false
 
+    /* \internal */
+    property alias __containsMouse: mouseArea.containsMouse
+
     Accessible.role: Accessible.Dial
     Accessible.name: value
 
diff --git a/src/private/AbstractCheckable.qml b/src/private/AbstractCheckable.qml
index ff65ab571..969dff0c7 100644
--- a/src/private/AbstractCheckable.qml
+++ b/src/private/AbstractCheckable.qml
@@ -79,14 +79,6 @@ Control {
     property bool checked: false
 
     /*!
-        \qmlproperty bool AbstractCheckable::containsMouse
-
-        This property is \c true if the control currently contains the
-        mouse cursor.
-    */
-    readonly property alias containsMouse: mouseArea.containsMouse
-
-    /*!
         This property is \c true if the control takes the focus when it is
         pressed; \l{QQuickItem::forceActiveFocus()}{forceActiveFocus()} will be
         called on the control.
@@ -106,6 +98,13 @@ Control {
     /*! \internal */
     property var __cycleStatesHandler: cycleRadioButtonStates
 
+    /*! \internal
+
+        This property is \c true if the control currently contains the
+        mouse cursor.
+    */
+    readonly property alias __containsMouse: mouseArea.containsMouse
+
     MouseArea {
         id: mouseArea
         focus: true
diff --git a/src/private/BasicButton.qml b/src/private/BasicButton.qml
index c11eb9b96..d776e84b9 100644
--- a/src/private/BasicButton.qml
+++ b/src/private/BasicButton.qml
@@ -55,7 +55,6 @@ Control {
 
     signal clicked
     property alias pressed: behavior.effectivePressed
-    property alias containsMouse: behavior.containsMouse
     property alias checkable: behavior.checkable  // button toggles between checked and !checked
     property alias checked: behavior.checked
     property ExclusiveGroup exclusiveGroup: null
@@ -77,6 +76,8 @@ Control {
 
     // implementation
     property string __position: "only"
+    /*! \internal */
+    property alias __containsMouse: behavior.containsMouse
 
     Keys.onPressed: {
         if (event.key === Qt.Key_Space && !event.isAutoRepeat && !behavior.pressed)
@@ -121,7 +122,7 @@ Control {
 
         Timer {
             interval: 1000
-            running: containsMouse && !pressed && tooltip.length
+            running: behavior.containsMouse && !pressed && tooltip.length
             onTriggered: PrivateHelper.showToolTip(behavior, Qt.point(behavior.mouseX, behavior.mouseY), tooltip)
         }
     }
diff --git a/src/styles/Desktop/ButtonStyle.qml b/src/styles/Desktop/ButtonStyle.qml
index b50b5ee63..814365b58 100644
--- a/src/styles/Desktop/ButtonStyle.qml
+++ b/src/styles/Desktop/ButtonStyle.qml
@@ -47,7 +47,7 @@ Style {
         elementType: "button"
         sunken: control.pressed || control.checked
         raised: !(control.pressed || control.checked)
-        hover: control.containsMouse
+        hover: control.__containsMouse
         text: control.iconSource === "" ? "" : control.text
         hasFocus: control.activeFocus
         hints: control.styleHints
diff --git a/src/styles/Desktop/CheckBoxStyle.qml b/src/styles/Desktop/CheckBoxStyle.qml
index a90c32904..cd12587db 100644
--- a/src/styles/Desktop/CheckBoxStyle.qml
+++ b/src/styles/Desktop/CheckBoxStyle.qml
@@ -53,7 +53,7 @@ Style {
             elementType: "checkbox"
             sunken: control.pressed
             on: control.checked || control.pressed
-            hover: control.containsMouse
+            hover: control.__containsMouse
             enabled: control.enabled
             hasFocus: control.activeFocus
             hints: {
diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml
index 361ccd415..c1d21a83a 100644
--- a/src/styles/Desktop/ComboBoxStyle.qml
+++ b/src/styles/Desktop/ComboBoxStyle.qml
@@ -57,7 +57,7 @@ Style {
             elementType: "combobox"
             sunken: control.pressed
             raised: !sunken
-            hover: control.containsMouse
+            hover: control.__containsMouse
             enabled: control.enabled
             text: control.selectedText
             hasFocus: control.activeFocus
diff --git a/src/styles/Desktop/RadioButtonStyle.qml b/src/styles/Desktop/RadioButtonStyle.qml
index 92376493c..12f1b1b7b 100644
--- a/src/styles/Desktop/RadioButtonStyle.qml
+++ b/src/styles/Desktop/RadioButtonStyle.qml
@@ -53,7 +53,7 @@ Style {
             elementType: "radiobutton"
             sunken: control.pressed
             on: control.checked || control.pressed
-            hover: control.containsMouse
+            hover: control.__containsMouse
             enabled: control.enabled
             hasFocus: control.activeFocus
             hints: control.styleHints
diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml
index 33447a0f7..099253e07 100644
--- a/src/styles/Desktop/ToolButtonStyle.qml
+++ b/src/styles/Desktop/ToolButtonStyle.qml
@@ -49,8 +49,8 @@ Style {
         elementType: "toolbutton"
         on: control.pressed | control.checked
         sunken: control.pressed
-        raised: control.containsMouse
-        hover: control.containsMouse
+        raised: control.__containsMouse
+        hover: control.__containsMouse
         hasFocus: control.activeFocus
         hints: control.styleHints.concat([control.__position])