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

Conflicts:
	.qmake.conf
	src/controls/Styles/Base/ComboBoxStyle.qml

Change-Id: Iaf45bc77be0bd80d21af49a5663dc9fba3caa0da

17 files changed, 19 insertions, 17 deletions

diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml
index 53497517..519ea958 100644
--- a/src/controls/Private/Style.qml
+++ b/src/controls/Private/Style.qml
@@ -48,6 +48,6 @@ import QtQuick.Controls.Private 1.0
 */
 
 AbstractStyle {
-    /*! The control attached to this style */
+    /*! The control this style is attached to. */
     readonly property Item control: __control
 }
diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index ce8550db..7e6e75f8 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -72,7 +72,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: indicatorstyle
 
-    /*! The \l BusyIndicator attached to this style. */
+    /*! The \l BusyIndicator this style is attached to. */
     readonly property BusyIndicator control: __control
 
     /*! This defines the appearance of the busy indicator. */
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index 566f93e5..426e7f61 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: buttonstyle
 
-    /*! The \l {QtQuick.Controls::}{Button} attached to this style. */
+    /*! The \l {QtQuick.Controls::}{Button} this style is attached to. */
     readonly property Button control: __control
 
     /*! The padding between the background and the label components. */
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml
index bb1c6970..a25222fe 100644
--- a/src/controls/Styles/Base/CalendarStyle.qml
+++ b/src/controls/Styles/Base/CalendarStyle.qml
@@ -125,7 +125,7 @@ Style {
     id: calendarStyle
 
     /*!
-        The Calendar attached to this style.
+        The Calendar this style is attached to.
     */
     readonly property Calendar control: __control
 
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index c8592b76..5702ca75 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: checkboxStyle
 
-    /*! The \l CheckBox attached to this style. */
+    /*! The \l CheckBox this style is attached to. */
     readonly property CheckBox control: __control
 
     /*! This defines the text label. */
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index f7236ba7..92154d0a 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -94,7 +94,7 @@ Style {
     */
     property color selectedTextColor: SystemPaletteSingleton.highlightedText(control.enabled)
 
-    /*! The \l ComboBox attached to this style. */
+    /*! The \l ComboBox this style is attached to. */
     readonly property ComboBox control: __control
 
     /*! The padding between the background and the label components. */
diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml
index 545ca07b..2adc18d0 100644
--- a/src/controls/Styles/Base/GroupBoxStyle.qml
+++ b/src/controls/Styles/Base/GroupBoxStyle.qml
@@ -50,7 +50,7 @@ import QtQuick.Controls.Private 1.0
 */
 Style {
 
-    /*! The \l GroupBox attached to this style. */
+    /*! The \l GroupBox this style is attached to. */
     readonly property GroupBox control: __control
 
     /*! The margin from the content item to the groupbox. */
diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index ec379884..88f04304 100644
--- a/src/controls/Styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
@@ -111,7 +111,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: progressBarStyle
 
-    /*! The \l ProgressBar attached to this style. */
+    /*! The \l ProgressBar this style is attached to. */
     readonly property ProgressBar control: __control
 
     /*! A value in the range [0-1] indicating the current progress. */
diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index 86b7c816..3fda616a 100644
--- a/src/controls/Styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
@@ -75,7 +75,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: radiobuttonStyle
 
-    /*! The \l RadioButton attached to this style. */
+    /*! The \l RadioButton this style is attached to. */
     readonly property RadioButton control: __control
 
     /*! This defines the text label. */
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index 20fc5a19..e8d10995 100644
--- a/src/controls/Styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
@@ -51,7 +51,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: root
 
-    /*! The \l ScrollView attached to this style. */
+    /*! The \l ScrollView this style is attached to. */
     readonly property ScrollView control: __control
 
     /*! This property controls the frame border padding of the scrollView. */
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index 1e2750fb..a4c4f0ea 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -82,7 +82,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: styleitem
 
-    /*! The \l Slider attached to this style. */
+    /*! The \l Slider this style is attached to. */
     readonly property Slider control: __control
 
     padding { top: 0 ; left: 0 ; right: 0 ; bottom: 0 }
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index e369cb7f..03863173 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -66,7 +66,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: spinboxStyle
 
-    /*! The \l SpinBox attached to this style. */
+    /*! The \l SpinBox this style is attached to. */
     readonly property SpinBox control: __control
 
     /*! The content margins of the text field. */
diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml
index 44c6ca72..35491ad3 100644
--- a/src/controls/Styles/Base/TabViewStyle.qml
+++ b/src/controls/Styles/Base/TabViewStyle.qml
@@ -81,7 +81,7 @@ import QtQuick.Controls.Private 1.0
 
 Style {
 
-    /*! The \l ScrollView attached to this style. */
+    /*! The \l ScrollView this style is attached to. */
     readonly property TabView control: __control
 
     /*! This property holds whether the user can move the tabs.
diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index b59a38ca..602049c4 100644
--- a/src/controls/Styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
@@ -54,7 +54,7 @@ import QtQuick.Controls.Private 1.0
 ScrollViewStyle {
     id: root
 
-    /*! The \l TableView attached to this style. */
+    /*! The \l TableView this style is attached to. */
     readonly property TableView control: __control
 
     /*! The text color. */
diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml
index 9f655bc4..a8dace6a 100644
--- a/src/controls/Styles/Base/TextAreaStyle.qml
+++ b/src/controls/Styles/Base/TextAreaStyle.qml
@@ -64,7 +64,7 @@ import QtQuick.Controls.Private 1.0
 ScrollViewStyle {
     id: style
 
-    /*! The \l TextArea attached to this style. */
+    /*! The \l TextArea this style is attached to. */
     readonly property TextArea control: __control
 
     /*! The current font. */
diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
index 167e09c9..ca639514 100644
--- a/src/controls/Styles/Base/TextFieldStyle.qml
+++ b/src/controls/Styles/Base/TextFieldStyle.qml
@@ -68,7 +68,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: style
 
-    /*! The \l TextField attached to this style. */
+    /*! The \l TextField this style is attached to. */
     readonly property TextField control: __control
 
     /*! The content margins of the text field. */
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index aa02e1f8..41d0ca48 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -833,9 +833,11 @@ ScrollView {
                 root.activated(currentRow);
         }
 
-        delegate: Item {
+        delegate: FocusScope {
             id: rowItemContainer
 
+            activeFocusOnTab: false
+
             property Item rowItem
             // We recycle instantiated row items to speed up list scrolling