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

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

Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b

20 files changed, 20 insertions, 20 deletions

diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
index 289b4545..150fd004 100644
--- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
@@ -83,7 +83,7 @@ ApplicationWindow {
 
                 Image {
                     id: avatar
-                    source: "qrc:/" + modelData + ".png"
+                    source: "qrc:/" + modelData.replace(" ", "_") + ".png"
                 }
             }
         }
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
index 80f2bad6..200fa0ae 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
@@ -80,7 +80,7 @@ Page {
 
             Image {
                 id: avatar
-                source: "qrc:/" + modelData + ".png"
+                source: "qrc:/" + modelData.replace(" ", "_") + ".png"
             }
         }
     }
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
index 23c414fb..1051b189 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
@@ -82,7 +82,7 @@ Page {
 
             Image {
                 id: avatar
-                source: "qrc:/" + model.display + ".png"
+                source: "qrc:/" + model.display.replace(" ", "_") + ".png"
             }
         }
     }
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
index 490202b6..bcae4b99 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
@@ -104,7 +104,7 @@ Page {
 
                     Image {
                         id: avatar
-                        source: !sentByMe ? "qrc:/" + model.author + ".png" : ""
+                        source: !sentByMe ? "qrc:/" + model.author.replace(" ", "_") + ".png" : ""
                     }
 
                     Rectangle {
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
index 1ea449fe..ad37ba5f 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
@@ -82,7 +82,7 @@ Page {
 
             Image {
                 id: avatar
-                source: "qrc:/" + model.display + ".png"
+                source: "qrc:/" + model.display.replace(" ", "_") + ".png"
             }
         }
     }
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
index 6f873162..2ec6a55e 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
@@ -104,7 +104,7 @@ Page {
 
                     Image {
                         id: avatar
-                        source: !sentByMe ? "qrc:/" + model.author + ".png" : ""
+                        source: !sentByMe ? "qrc:/" + model.author.replace(" ", "_") + ".png" : ""
                     }
 
                     Rectangle {
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 173403ac..519d1c7a 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -149,7 +149,7 @@ how to navigate between several pages.
 \printuntil }
 
 We replace the default \c{MainForm {...}} code block with a Page, which is
-sized to occupy all the space on the window using the \l{anchors.fill}
+sized to occupy all the space on the window using the \l {Item::}{anchors.fill}
 property.
 
 Then, we assign a \l Label to its \l {Page::}{header} property. Label extends
@@ -245,7 +245,7 @@ Here is our ListView:
 \section2 Sizing and Positioning
 
 The first thing we do is set a size for the view. It should fill the available
-space on the page, so we use \l {Item::anchors}{anchors.fill}. Note that
+space on the page, so we use \l {Item::}{anchors.fill}. Note that
 Page ensures that its header and footer have enough of their own space
 reserved, so the view in this case will sit below the header, for example.
 
diff --git a/examples/quickcontrols2/chattutorial/shared/Albert Einstein.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png
index 47cb15f6..47cb15f6 100644
--- a/examples/quickcontrols2/chattutorial/shared/Albert Einstein.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@2x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png
index c80ddd15..c80ddd15 100644
--- a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@3x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png
index 41778835..41778835 100644
--- a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@4x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png
index 88768902..88768902 100644
--- a/examples/quickcontrols2/chattutorial/shared/Albert Einstein@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png
index 988c2416..988c2416 100644
--- a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@2x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png
index efffc1f2..efffc1f2 100644
--- a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@3x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png
index 12633ec2..12633ec2 100644
--- a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@4x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png
index f5639280..f5639280 100644
--- a/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Hans Gude.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png
index 7367a4a4..7367a4a4 100644
--- a/examples/quickcontrols2/chattutorial/shared/Hans Gude.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Hans Gude@2x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png
index c3a394e1..c3a394e1 100644
--- a/examples/quickcontrols2/chattutorial/shared/Hans Gude@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Hans Gude@3x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png
index 38ec67ee..38ec67ee 100644
--- a/examples/quickcontrols2/chattutorial/shared/Hans Gude@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/Hans Gude@4x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png
index 8c75d3e0..8c75d3e0 100644
--- a/examples/quickcontrols2/chattutorial/shared/Hans Gude@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png
diff --git a/examples/quickcontrols2/chattutorial/shared/shared.qrc b/examples/quickcontrols2/chattutorial/shared/shared.qrc
index 8e112513..9eda6aa2 100644
--- a/examples/quickcontrols2/chattutorial/shared/shared.qrc
+++ b/examples/quickcontrols2/chattutorial/shared/shared.qrc
@@ -1,16 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>Albert Einstein.png</file>
-        <file>Albert Einstein@2x.png</file>
-        <file>Albert Einstein@3x.png</file>
-        <file>Albert Einstein@4x.png</file>
-        <file>Ernest Hemingway.png</file>
-        <file>Ernest Hemingway@2x.png</file>
-        <file>Ernest Hemingway@3x.png</file>
-        <file>Ernest Hemingway@4x.png</file>
-        <file>Hans Gude.png</file>
-        <file>Hans Gude@2x.png</file>
-        <file>Hans Gude@3x.png</file>
-        <file>Hans Gude@4x.png</file>
+        <file>Albert_Einstein.png</file>
+        <file>Albert_Einstein@2x.png</file>
+        <file>Albert_Einstein@3x.png</file>
+        <file>Albert_Einstein@4x.png</file>
+        <file>Ernest_Hemingway.png</file>
+        <file>Ernest_Hemingway@2x.png</file>
+        <file>Ernest_Hemingway@3x.png</file>
+        <file>Ernest_Hemingway@4x.png</file>
+        <file>Hans_Gude.png</file>
+        <file>Hans_Gude@2x.png</file>
+        <file>Hans_Gude@3x.png</file>
+        <file>Hans_Gude@4x.png</file>
     </qresource>
 </RCC>