Merge remote-tracking branch 'origin/qds-1.59'

 Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68

5 files changed, 14 insertions, 8 deletions

diff --git a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
index c00bde1ce8..744fe6b2e2 100644
--- a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
+++ b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
@@ -83,7 +83,7 @@ Image {
         width: 270
         height: 24
         color: "#ffffff"
-        text: qsTr("Copyright 2008 - 2019 The Qt Company")
+        text: qsTr("Copyright 2008 - 2020 The Qt Company")
         font.pixelSize: 16
         font.family: StudioFonts.titilliumWeb_light
     }
diff --git a/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml b/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml
index aa797b0752..a32dd6e1a8 100644
--- a/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml
+++ b/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml
@@ -75,14 +75,20 @@ ListModel {
     }
 
     ListElement {
-        displayName: "Qt Design Studio: 1.0 and Ready to Go!"
-        thumbnail: "images/ready_to_go.png"
-        url: "https://www.youtube.com/watch?v=i9ToZ_04kTk"
-    }
-
-    ListElement {
         displayName: "QTWS - Designer and Developer Workflow"
         thumbnail: "images/qtws_video_thumbnail.png"
         url: "https://www.youtube.com/watch?v=4ug0EUdS2RM"
     }
+
+    ListElement {
+        displayName: "QTWS - Turn UI designs into working prototypes"
+        thumbnail: "images/bridging_the_gap.png"
+        url: "https://www.youtube.com/watch?v=qQM2oEWRBOw&feature=emb_logo"
+    }
+
+    ListElement {
+        displayName: "What's New in Design Studio 1.5"
+        thumbnail: "images/what_is_new_15.png"
+        url: "https://www.youtube.com/watch?v=e-HAZrisi5o"
+    }
 }
diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png b/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png
new file mode 100644
index 0000000000..2702abf417
--- /dev/null
+++ b/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png
diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/ready_to_go.png b/src/plugins/studiowelcome/qml/welcomepage/images/ready_to_go.png
deleted file mode 100644
index af81a8a1d3..0000000000
--- a/src/plugins/studiowelcome/qml/welcomepage/images/ready_to_go.png
+++ /dev/null
diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png b/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png
new file mode 100644
index 0000000000..cf14a7d718
--- /dev/null
+++ b/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png