Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_stackview.qml

Change-Id: I54b55d51452e812315f97bcdfd1a8e361a427f56

1 files changed, 9 insertions, 6 deletions

diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index 1bcb6b5c..d821940a 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -210,7 +210,8 @@ Style {
         }
     }
 
-    /*! The cursor handle.
+    /*! \internal
+        The cursor handle.
         \since QtQuick.Controls.Styles 1.3
 
         The parent of the handle is positioned to the top left corner of
@@ -227,9 +228,10 @@ Style {
             \row \li \b {styleData.hasSelection} : bool \li Whether the editor has selected text.
         \endtable
     */
-    property Component cursorHandle
+    property Component __cursorHandle
 
-    /*! The selection handle.
+    /*! \internal
+        The selection handle.
         \since QtQuick.Controls.Styles 1.3
 
         The parent of the handle is positioned to the top left corner of
@@ -246,10 +248,11 @@ Style {
             \row \li \b {styleData.hasSelection} : bool \li Whether the editor has selected text.
         \endtable
     */
-    property Component selectionHandle
+    property Component __selectionHandle
 
-    /*! The cursor delegate.
+    /*! \internal
+        The cursor delegate.
         \since QtQuick.Controls.Styles 1.3
     */
-    property Component cursorDelegate
+    property Component __cursorDelegate
 }