Merge remote-tracking branch 'origin/8.0'

resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0

2 files changed, 8 insertions, 50 deletions

diff --git a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
index e6bedf2074..4809612d84 100644
--- a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
+++ b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
@@ -233,56 +233,6 @@ Rectangle {
     }
 
     Row {
-        y: 690
-        visible: false
-        anchors.horizontalCenter: parent.horizontalCenter
-        spacing: 20
-        layoutDirection: Qt.LeftToRight
-
-        CheckBox {
-            visible: true
-            id: usageStatisticCheckBox
-            text: qsTr("Send Usage Statistics")
-            checked: usageStatisticModel.usageStatisticEnabled
-            padding: 0
-            spacing: 12
-
-            onCheckedChanged: usageStatisticModel.setTelemetryEnabled(
-                                  usageStatisticCheckBox.checked)
-
-            contentItem: Text {
-                text: usageStatisticCheckBox.text
-                color: "#ffffff"
-                leftPadding: usageStatisticCheckBox.indicator.width + usageStatisticCheckBox.spacing
-                font.pixelSize: 12
-            }
-        }
-
-        CheckBox {
-            visible: true
-            id: crashReportCheckBox
-            text: qsTr("Send Crash Reports")
-            spacing: 12
-            checked: usageStatisticModel.crashReporterEnabled
-
-            onCheckedChanged: {
-                usageStatisticModel.setCrashReporterEnabled(
-                            crashReportCheckBox.checked)
-                welcome_splash.onPluginInitialized(true,
-                                                   crashReportCheckBox.checked)
-            }
-
-            contentItem: Text {
-                color: "#ffffff"
-                text: crashReportCheckBox.text
-                leftPadding: crashReportCheckBox.indicator.width + crashReportCheckBox.spacing
-                font.pixelSize: 12
-            }
-            padding: 0
-        }
-    }
-
-    Row {
         id: designStudioVersion
         anchors.top: logo.bottom
         anchors.topMargin: 5
diff --git a/src/plugins/studiowelcome/qml/splashscreen/main.qml b/src/plugins/studiowelcome/qml/splashscreen/main.qml
index 3d453fe85e..3428fea6da 100644
--- a/src/plugins/studiowelcome/qml/splashscreen/main.qml
+++ b/src/plugins/studiowelcome/qml/splashscreen/main.qml
@@ -5,6 +5,14 @@ import QtQuick 2.0
 
 Item {
     id: root
+
+    focus: true
+    Keys.onPressed: (event)=> {
+        if (event.key == Qt.Key_Escape)
+            root.doNotShowAgain = false
+            root.closeClicked()
+    }
+
     width: 600 * root.mainScale
     height: 720 * root.mainScale