Merge remote-tracking branch 'origin/4.5'

Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed

121 files changed, 638 insertions, 271 deletions

diff --git a/doc/examples/accelbubble/Bubble.qml b/doc/examples/accelbubble/Bubble.qml
index bb21875951..67e1c5922d 100644
--- a/doc/examples/accelbubble/Bubble.qml
+++ b/doc/examples/accelbubble/Bubble.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator
@@ -48,9 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
 Image {
     source: "Bluebubble.svg"
diff --git a/doc/examples/accelbubble/Page1Form.ui.qml b/doc/examples/accelbubble/Page1Form.ui.qml
index d336fa3b7a..0ab08fc483 100644
--- a/doc/examples/accelbubble/Page1Form.ui.qml
+++ b/doc/examples/accelbubble/Page1Form.ui.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator
@@ -47,14 +47,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-
-Item {
-    property alias mainWindow: mainWindow
+Page {
+    width: 600
+    height: 400
     property alias bubble: bubble
+    property alias mainWindow: mainWindow
+
+    header: Label {
+        text: qsTr("Page 1")
+        font.pixelSize: Qt.application.font.pixelSize * 2
+        padding: 10
+    }
+
     Rectangle {
         id: mainWindow
         color: "#ffffff"
diff --git a/doc/examples/accelbubble/Page1.qml b/doc/examples/accelbubble/Page2Form.ui.qml
index 0619779873..11a8abff4a 100644
--- a/doc/examples/accelbubble/Page1.qml
+++ b/doc/examples/accelbubble/Page2Form.ui.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator
@@ -47,9 +47,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
-import QtQuick 2.7
+Page {
+    width: 600
+    height: 400
 
-Page1Form {
+    header: Label {
+        text: qsTr("Page 2")
+        font.pixelSize: Qt.application.font.pixelSize * 2
+        padding: 10
+    }
 
+    Label {
+        text: qsTr("You are on Page 2.")
+        anchors.centerIn: parent
+    }
 }
diff --git a/doc/examples/accelbubble/accelbubble.pro b/doc/examples/accelbubble/accelbubble.pro
index dca3207dce..2dfcd42652 100644
--- a/doc/examples/accelbubble/accelbubble.pro
+++ b/doc/examples/accelbubble/accelbubble.pro
@@ -1,17 +1,7 @@
-QT += qml quick sensors svg xml
+QT += quick sensors svg xml
 
 CONFIG += c++11
 
-SOURCES += main.cpp
-
-RESOURCES += qml.qrc
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -23,7 +13,25 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+  ios {
+  QTPLUGIN += qsvg qsvgicon qtsensors_ios
+  QMAKE_INFO_PLIST = Info.plist
+  }
+
+DISTFILES += \
+    Bluebubble.svg
diff --git a/doc/examples/accelbubble/main.cpp b/doc/examples/accelbubble/main.cpp
index 6ff25a462c..4e002b280e 100644
--- a/doc/examples/accelbubble/main.cpp
+++ b/doc/examples/accelbubble/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator
@@ -54,10 +54,13 @@
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
 
     return app.exec();
 }
diff --git a/doc/examples/accelbubble/main.qml b/doc/examples/accelbubble/main.qml
index ddd617af69..26fe2598f0 100644
--- a/doc/examples/accelbubble/main.qml
+++ b/doc/examples/accelbubble/main.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator
@@ -48,10 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import QtSensors 5.7
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtSensors 5.9
 
 ApplicationWindow {
     visible: true
@@ -59,64 +58,84 @@ ApplicationWindow {
     height: 480
     title: qsTr("Accelerate Bubble")
 
-    Page1 {
+    SwipeView {
+        id: swipeView
         anchors.fill: parent
-        bubble {
-            id: bubble
-            centerX: mainWindow.width / 2
-            centerY: mainWindow.height / 2
-            bubbleCenter: bubble.width / 2
-            x: bubble.centerX - bubble.bubbleCenter
-            y: bubble.centerY - bubble.bubbleCenter
-
-            Behavior on y {
-                SmoothedAnimation {
-                    easing.type: Easing.Linear
-                    duration: 100
+        currentIndex: tabBar.currentIndex
+
+        Page1Form {
+            bubble {
+                id: bubble
+                centerX: mainWindow.width / 2
+                centerY: mainWindow.height / 2
+                bubbleCenter: bubble.width / 2
+                x: bubble.centerX - bubble.bubbleCenter
+                y: bubble.centerY - bubble.bubbleCenter
+
+                Behavior on y {
+                    SmoothedAnimation {
+                        easing.type: Easing.Linear
+                        duration: 100
+                    }
                 }
-            }
-            Behavior on x {
-                SmoothedAnimation {
-                    easing.type: Easing.Linear
-                    duration: 100
+                Behavior on x {
+                    SmoothedAnimation {
+                        easing.type: Easing.Linear
+                        duration: 100
+                    }
                 }
             }
         }
+
+        Page2Form {
+        }
+    }
+
+    footer: TabBar {
+        id: tabBar
+        currentIndex: swipeView.currentIndex
+
+        TabButton {
+            text: qsTr("Page 1")
+        }
+        TabButton {
+            text: qsTr("Page 2")
+        }
     }
 
     Accelerometer {
-           id: accel
-           dataRate: 100
-           active: true
+       id: accel
+       dataRate: 100
+       active: true
 
-           onReadingChanged: {
-               var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
-               var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
+       onReadingChanged: {
+           var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
+           var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
 
-               if (isNaN(newX) || isNaN(newY))
-                   return;
+           if (isNaN(newX) || isNaN(newY))
+               return;
 
-               if (newX < 0)
-                   newX = 0
+           if (newX < 0)
+               newX = 0
 
-               if (newX > mainWindow.width - bubble.width)
-                   newX = mainWindow.width - bubble.width
+           if (newX > mainWindow.width - bubble.width)
+               newX = mainWindow.width - bubble.width
 
-               if (newY < 18)
-                   newY = 18
+           if (newY < 18)
+               newY = 18
 
-               if (newY > mainWindow.height - bubble.height)
-                   newY = mainWindow.height - bubble.height
+           if (newY > mainWindow.height - bubble.height)
+               newY = mainWindow.height - bubble.height
 
-                   bubble.x = newX
-                   bubble.y = newY
-           }
+               bubble.x = newX
+               bubble.y = newY
        }
+   }
 
-       function calcPitch(x, y, z) {
-           return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795);
-       }
-       function calcRoll(x, y, z) {
-           return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795);
-       }
+    function calcPitch(x, y, z) {
+        return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795);
+    }
+    function calcRoll(x, y, z) {
+        return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795);
+    }
 }
diff --git a/doc/examples/accelbubble/qml.qrc b/doc/examples/accelbubble/qml.qrc
index 1825fab490..7d7777aca0 100644
--- a/doc/examples/accelbubble/qml.qrc
+++ b/doc/examples/accelbubble/qml.qrc
@@ -1,10 +1,10 @@
 <RCC>
     <qresource prefix="/">
-        <file>main.qml</file>
-        <file>Page1.qml</file>
         <file>Page1Form.ui.qml</file>
+        <file>Page2Form.ui.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>Bubble.qml</file>
         <file>Bluebubble.svg</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/doc/examples/accelbubble/qtquickcontrols2.conf b/doc/examples/accelbubble/qtquickcontrols2.conf
index 1764b16fb4..75b2cb8fff 100644
--- a/doc/examples/accelbubble/qtquickcontrols2.conf
+++ b/doc/examples/accelbubble/qtquickcontrols2.conf
@@ -1,15 +1,6 @@
 ; This file can be edited to change the style of the application
-; See Styling Qt Quick Controls 2 in the documentation for details:
-; http://doc.qt.io/qt-5/qtquickcontrols2-styles.html
+; Read "Qt Quick Controls 2 Configuration File" for details:
+; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html
 
 [Controls]
 Style=Default
-
-[Universal]
-Theme=Light
-;Accent=Steel
-
-[Material]
-Theme=Light
-;Accent=BlueGrey
-;Primary=BlueGray
diff --git a/doc/examples/transitions/Page1.qml b/doc/examples/transitions/Page1.qml
deleted file mode 100644
index 67336b4af7..0000000000
--- a/doc/examples/transitions/Page1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.7
-
-Page1Form {
-
-}
diff --git a/doc/examples/transitions/Page1Form.ui.qml b/doc/examples/transitions/Page1Form.ui.qml
index 2637f1d0af..785433154d 100644
--- a/doc/examples/transitions/Page1Form.ui.qml
+++ b/doc/examples/transitions/Page1Form.ui.qml
@@ -1,11 +1,66 @@
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
-Item {
+Page {
     id: page
-    width: 300
-    height: 300
+    width: 600
+    height: 400
+
+    header: Label {
+        text: qsTr("Page 1")
+        font.pixelSize: Qt.application.font.pixelSize * 2
+        padding: 10
+    }
+
     property alias icon: icon
     property alias topLeftRect: topLeftRect
     property alias bottomLeftRect: bottomLeftRect
diff --git a/doc/examples/transitions/Page2Form.ui.qml b/doc/examples/transitions/Page2Form.ui.qml
new file mode 100644
index 0000000000..11a8abff4a
--- /dev/null
+++ b/doc/examples/transitions/Page2Form.ui.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+Page {
+    width: 600
+    height: 400
+
+    header: Label {
+        text: qsTr("Page 2")
+        font.pixelSize: Qt.application.font.pixelSize * 2
+        padding: 10
+    }
+
+    Label {
+        text: qsTr("You are on Page 2.")
+        anchors.centerIn: parent
+    }
+}
diff --git a/doc/examples/transitions/main.cpp b/doc/examples/transitions/main.cpp
index 34614e7477..4e002b280e 100644
--- a/doc/examples/transitions/main.cpp
+++ b/doc/examples/transitions/main.cpp
@@ -1,13 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
 
     return app.exec();
 }
diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml
index 3775d82158..464b48e545 100644
--- a/doc/examples/transitions/main.qml
+++ b/doc/examples/transitions/main.qml
@@ -1,26 +1,82 @@
-import QtQuick 2.7
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
 ApplicationWindow {
     visible: true
     width: 640
     height: 480
-    title: qsTr("Transitions")
+    title: qsTr("Tabs")
 
-    Page1Form {
+    SwipeView {
+        id: swipeView
         anchors.fill: parent
-        id: page
+        currentIndex: tabBar.currentIndex
 
-        mouseArea {
-        onClicked: stateGroup.state = ' '
-        }
-        mouseArea1 {
-        onClicked: stateGroup.state = 'State1'
+        Page1Form {
+            id: page
+
+            mouseArea {
+            onClicked: stateGroup.state = ' '
+            }
+            mouseArea1 {
+            onClicked: stateGroup.state = 'State1'
+            }
+            mouseArea2 {
+            onClicked: stateGroup.state = 'State2'
+            }
         }
-        mouseArea2 {
-        onClicked: stateGroup.state = 'State2'
+
+        Page2Form {
         }
     }
 
@@ -71,4 +127,16 @@ ApplicationWindow {
             }
         ]
     }
+
+    footer: TabBar {
+        id: tabBar
+        currentIndex: swipeView.currentIndex
+
+        TabButton {
+            text: qsTr("Page 1")
+        }
+        TabButton {
+            text: qsTr("Page 2")
+        }
+    }
 }
diff --git a/doc/examples/transitions/qml.qrc b/doc/examples/transitions/qml.qrc
index bba8291fc0..299ee42d85 100644
--- a/doc/examples/transitions/qml.qrc
+++ b/doc/examples/transitions/qml.qrc
@@ -1,8 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-        <file>Page1.qml</file>
         <file>Page1Form.ui.qml</file>
+        <file>Page2Form.ui.qml</file>
+        <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>qt-logo.png</file>
     </qresource>
diff --git a/doc/examples/transitions/qtquickcontrols2.conf b/doc/examples/transitions/qtquickcontrols2.conf
index 1764b16fb4..75b2cb8fff 100644
--- a/doc/examples/transitions/qtquickcontrols2.conf
+++ b/doc/examples/transitions/qtquickcontrols2.conf
@@ -1,15 +1,6 @@
 ; This file can be edited to change the style of the application
-; See Styling Qt Quick Controls 2 in the documentation for details:
-; http://doc.qt.io/qt-5/qtquickcontrols2-styles.html
+; Read "Qt Quick Controls 2 Configuration File" for details:
+; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html
 
 [Controls]
 Style=Default
-
-[Universal]
-Theme=Light
-;Accent=Steel
-
-[Material]
-Theme=Light
-;Accent=BlueGrey
-;Primary=BlueGray
diff --git a/doc/examples/transitions/transitions.pro b/doc/examples/transitions/transitions.pro
index d0d4cd2979..e2173bcccb 100644
--- a/doc/examples/transitions/transitions.pro
+++ b/doc/examples/transitions/transitions.pro
@@ -1,17 +1,6 @@
-QT += qml quick
-
+QT += quick
 CONFIG += c++11
 
-SOURCES += main.cpp
-
-RESOURCES += qml.qrc
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -23,6 +12,16 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
diff --git a/doc/images/creator_android_tutorial_ex_app.png b/doc/images/creator_android_tutorial_ex_app.png
index ad4cfc0765..3be9f31fe2 100644
--- a/doc/images/creator_android_tutorial_ex_app.png
+++ b/doc/images/creator_android_tutorial_ex_app.png
diff --git a/doc/images/qmldesigner-element-size.png b/doc/images/qmldesigner-element-size.png
index 47c555642f..ad2d3b666b 100644
--- a/doc/images/qmldesigner-element-size.png
+++ b/doc/images/qmldesigner-element-size.png
diff --git a/doc/images/qmldesigner-navigator-arrows.png b/doc/images/qmldesigner-navigator-arrows.png
index 06d884b5c5..ecc59fcec1 100644
--- a/doc/images/qmldesigner-navigator-arrows.png
+++ b/doc/images/qmldesigner-navigator-arrows.png
diff --git a/doc/images/qmldesigner-navigator.png b/doc/images/qmldesigner-navigator.png
index fc168249f8..4fe5e737c6 100644
--- a/doc/images/qmldesigner-navigator.png
+++ b/doc/images/qmldesigner-navigator.png
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png
index 10480502f9..bd6679aa08 100644
--- a/doc/images/qmldesigner-new-project.png
+++ b/doc/images/qmldesigner-new-project.png
diff --git a/doc/images/qmldesigner-tutorial-design-mode.png b/doc/images/qmldesigner-tutorial-design-mode.png
index d2a522f01c..e8b2bd2301 100644
--- a/doc/images/qmldesigner-tutorial-design-mode.png
+++ b/doc/images/qmldesigner-tutorial-design-mode.png
diff --git a/doc/images/qmldesigner-tutorial-topleftrect.png b/doc/images/qmldesigner-tutorial-topleftrect.png
index 17bc686d8f..c3b181965b 100644
--- a/doc/images/qmldesigner-tutorial-topleftrect.png
+++ b/doc/images/qmldesigner-tutorial-topleftrect.png
diff --git a/doc/images/qmldesigner-tutorial-ui-ready.png b/doc/images/qmldesigner-tutorial-ui-ready.png
index 0cc60262ed..1ed4037cd1 100644
--- a/doc/images/qmldesigner-tutorial-ui-ready.png
+++ b/doc/images/qmldesigner-tutorial-ui-ready.png
diff --git a/doc/images/qmldesigner-tutorial-user-icon.png b/doc/images/qmldesigner-tutorial-user-icon.png
index e5a36ebceb..5422a42f34 100644
--- a/doc/images/qmldesigner-tutorial-user-icon.png
+++ b/doc/images/qmldesigner-tutorial-user-icon.png
diff --git a/doc/images/qmldesigner-tutorial.png b/doc/images/qmldesigner-tutorial.png
index 64b1e4752e..39cd385885 100644
--- a/doc/images/qmldesigner-tutorial.png
+++ b/doc/images/qmldesigner-tutorial.png
diff --git a/doc/images/qtcreator-android-deploy-configurations.png b/doc/images/qtcreator-android-deploy-configurations.png
index 8cd0a22003..b09cbce6de 100644
--- a/doc/images/qtcreator-android-deploy-configurations.png
+++ b/doc/images/qtcreator-android-deploy-configurations.png
diff --git a/doc/images/qtcreator-move-component-into-separate-file.png b/doc/images/qtcreator-move-component-into-separate-file.png
index d5bf10192e..a0de19b24e 100644
--- a/doc/images/qtcreator-move-component-into-separate-file.png
+++ b/doc/images/qtcreator-move-component-into-separate-file.png
diff --git a/doc/images/qtcreator-new-qt-gui-application.png b/doc/images/qtcreator-new-qt-gui-application.png
index 62895ef9d1..fff63015df 100644
--- a/doc/images/qtcreator-new-qt-gui-application.png
+++ b/doc/images/qtcreator-new-qt-gui-application.png
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index 5b518dc225..1f8dcabd2d 100644
--- a/doc/images/qtcreator-new-qt-quick-project-wizard.png
+++ b/doc/images/qtcreator-new-qt-quick-project-wizard.png
diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc
index 10f8105d9d..4dd0f0b3b1 100644
--- a/doc/src/android/deploying-android.qdoc
+++ b/doc/src/android/deploying-android.qdoc
@@ -44,12 +44,6 @@
             The Ministro tool downloads the necessary Qt libraries from a
             repository of your choice.
 
-        \li As an incomplete APK that is suitable for testing and debugging
-            applications on a device connected to the development host. The APK
-            relies on the device containing the Qt libraries in the correct
-            location. \QC copies the libraries to that location the first time
-            you deploy the application.
-
     \endlist
 
     To specify settings for application packages, select \uicontrol Projects >
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 2facd5ad14..26209b6c04 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -107,18 +107,20 @@
                 Use \QD forms to design a Qt widget based user interface for the
                 desktop and C++ to implement the application logic
 
-            \li Qt Quick Application
+            \li Qt Quick Application - Empty
+
+                Create an empty Qt Quick application that uses Qt Quick 2 types.
 
-                Create a Qt Quick application that contains both QML and C++
-                code. The project includes a QQuickView.
                 You can build the application and deploy it to desktop,
                 embedded, and mobile target platforms.
 
-            \li Qt Quick Controls 2 Application
+            \li Qt Quick Application - Scroll, Stack, or Swipe
 
-                Create a Qt Quick application using
+                Create a Qt Quick application that uses
                 \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
-                {Qt Quick Controls 2} (requires Qt 5.7 or later)
+                {Qt Quick Controls 2} to implement a scrollable list (requires
+                Qt 5.9 or later) or a set of pages with a stack-based or
+                swipe-based navigation model (requires Qt 5.7 or later).
 
             \li Qt Canvas 3D Application
 
diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
index 5ab76d6302..f0fddbacfd 100644
--- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
+++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
@@ -82,14 +82,14 @@
 
     \list 1
 
-        \li In the \uicontrol Projects view, double-click the Page1Form.ui.qml
+        \li In the \uicontrol Projects view, double-click the \e Page1Form.ui.qml
             file to open it in \QMLD.
 
-        \li In the \uicontrol Navigator, select \uicontrol RowLayout and press
+        \li In the \uicontrol Navigator, select \uicontrol Label and press
             \key Delete to delete it.
 
         \li In \uicontrol Library > \uicontrol {QML Types}, select
-            \uicontrol Rectangle and drag and drop it to the \uicontrol Item in
+            \uicontrol Rectangle and drag and drop it to the \uicontrol Page in
             the navigator.
 
         \li Select the rectangle in the navigator to edit its properties:
@@ -137,39 +137,32 @@
 
     \endlist
 
-    \QC creates a reference to the Bubble type in Page1Form.ui.qml.
+    \QC creates a reference to the Bubble type in \e Page1Form.ui.qml.
 
-    To check your code, you can compare Page1Form.ui.qml with the
+    To check your code, you can compare \e Page1Form.ui.qml with the
     \l{accelbubble/Page1Form.ui.qml}{Page1Form.ui.qml} example file and
-    Bubble.qml with the \l{accelbubble/Bubble.qml}{Bubble.qml} example file.
+    \e Bubble.qml with the \l{accelbubble/Bubble.qml}{Bubble.qml} example file.
 
-    The UI is now ready and you can switch to editing the Page1.qml and
-    Bubble.qml files in the \uicontrol {Text Editor}, as described in the
+    The UI is now ready and you can switch to editing the \e Bubble.qml and
+    \e main.qml files in the \uicontrol {Text Editor}, as described in the
     following section.
 
     \section1 Moving the Bubble
 
-    The new project wizard adds boilerplate code to the main.qml file to create
-    menu items and push buttons. Modify the boilerplate code by removing
-    obsolete code and by adding new code. You removed the push buttons from the
-    UI Form, so you also need to remove the corresponding code from Page1.qml
-    (or the application cannot be built).
-
-    In the \uicontrol {Text Editor}, edit Bubble.qml to add properties that we
-    use to will position the image:
+    In the \uicontrol {Text Editor}, edit \e Bubble.qml to add properties that we
+    will use to position the image:
 
     \quotefromfile accelbubble/Bubble.qml
     \skipto Image
     \printuntil }
 
-    In the \uicontrol {Text Editor}, edit main.qml to specify the application
+    In the \uicontrol {Text Editor}, edit \e main.qml to specify the application
     title, as illustrated by the following code snippet:
 
     \quotefromfile accelbubble/main.qml
     \skipto ApplicationWindow
     \printuntil title
 
-    Remove the rest of the boilerplate code in main.qml, except the Page1 type.
     Specify bubble properties to position the image:
 
     \printuntil bubbleCenter
@@ -183,10 +176,10 @@
     Then add code to move the bubble based on Accelerometer sensor values:
 
     \list 1
-        \li Add the following import statement to main.qml:
+        \li Add the following import statement to \e main.qml:
 
             \code
-            import QtSensors 5.7
+            import QtSensors 5.9
             \endcode
 
         \li Add the \l{Accelerometer} type with the necessary properties:
diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
index 44923b221b..eab08b2971 100644
--- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
+++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
@@ -26,13 +26,13 @@
 /*!
 //! [qt quick application]
 
-    \section1 Creating Qt Quick Controls 2 Applications
+    \section1 Creating the Project
 
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol Application > \uicontrol {Qt Quick Controls 2 Application}
-            > \uicontrol Choose.
+            \uicontrol Application > \uicontrol {Qt Quick Application - Swipe} >
+            \uicontrol Choose.
 
         \li In the \uicontrol Name field, enter a name for the application.
 
@@ -66,10 +66,11 @@
 
     \endlist
 
-    \QC generates a UI file, \e Page1Form.ui.qml, that you can modify in the
-    \QMLD \uicontrol {Form Editor} and two QML files, \e Page1.qml and
-    \e main.qml, that you can modify in the \uicontrol {Text Editor} to add the
-    application logic.
+    \QC generates two UI files, \e Page1Form.ui.qml and \e Page2Form.ui.qml,
+    and a QML file, \e main.qml. You can modify \e Page1Form.ui.qml in the
+    \uicontrol {Form Editor} to create the application main view and \e main.qml
+    in the \uicontrol {Text Editor} to add the application logic. For the
+    purposes of this example, you can ignore \e Page2Form.ui.qml.
 
 //! [qt quick application]
 */
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index dbbee8e71b..147df44a43 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -73,10 +73,10 @@
 
             \image qmldesigner-tutorial-design-mode.png "Transitions project in Design Mode"
 
-        \li In the \uicontrol Navigator, select \uicontrol RowLayout and press
+        \li In the \uicontrol Navigator, select \uicontrol Label and press
             \key Delete to delete it.
 
-        \li Select \uicontrol Item in the navigator, and enter \e page in the
+        \li Select \uicontrol Page in the navigator, and enter \e page in the
             \uicontrol Id field.
 
         \li In \uicontrol Library > \uicontrol Resources, select qt-logo.png and
@@ -242,6 +242,7 @@
             expressions for the x and y properties, as illustrated by the
             following code snippet:
 
+            \skipto StateGroup
             \printuntil ]
 
         \li Press \key {Ctrl+R} to run the application.
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index c663018498..5b9d5d4834 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -45,15 +45,25 @@
 
     \list
 
-        \li \uicontrol {Qt Quick Application} creates a Qt Quick 2 application
-            project that can contain both QML and C++ code. The project includes
-            a QQuickView. You can build the application and deploy it to desktop,
-            embedded, and mobile target platforms.
-
-        \li \uicontrol {Qt Quick Controls 2 Application} is like
-            \uicontrol {Qt Quick Application}, but using
-            \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
-            {Qt Quick Controls 2} (requires Qt 5.7 or later).
+        \li \uicontrol {Qt Quick Application - Empty} creates a Qt Quick 2
+            application project that can contain both QML and C++ code. You can
+            build the application and deploy it to desktop, embedded, and mobile
+            target platforms.
+
+        \li \uicontrol {Qt Quick Application - Scroll} uses the
+            \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-scrollview.html}
+            {ScrollView} type to implement a scrollable list view
+            (requires Qt 5.9 or later).
+
+        \li \uicontrol {Qt Quick Application - Stack} uses the
+            \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-stackview.html}
+            {StackView} type to implement a set of pages with a stack-based
+            navigation model (requires Qt 5.7 or later).
+
+        \li \uicontrol {Qt Quick Application - Swipe} uses the
+            \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-swipeview.html}
+            {SwipeWiew} type to implement a set of pages with a swipe-based
+            navigation model (requires Qt 5.7 or later).
 
         \li \uicontrol {Qt Canvas 3D Application} creates a Qt Quick application
             that imports the Qt Canvas 3D module and, optionally, includes
@@ -85,12 +95,12 @@
     \QC creates the necessary boilerplate files. Some of the files are
     specific to a particular target platform.
 
-    \section1 Creating Qt Quick Applications
+    \section1 Creating Empty Qt Quick Applications
 
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol Application > \uicontrol {Qt Quick Application} >
+            \uicontrol Application > \uicontrol {Qt Quick Application - Empty} >
             \uicontrol Choose.
 
         \li In the \uicontrol Name field, enter a name for the application.
@@ -110,11 +120,9 @@
             The Qt version determines the Qt Quick imports that are used in the
             QML files.
 
-        \li Select the
-            \uicontrol {With .ui.qml file} check box to create an UI
-            form that can contain a subset of the QML language. Similarly as
-            with the UI forms for \QD, it is recommended that you use \QMLD to
-            edit the UI forms. For more information, see \l{Qt Quick UI Forms}.
+        \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add
+            support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html}
+            {Qt Virtual Keyboard} to the application.
 
         \li Select \uicontrol Next.
 
@@ -130,13 +138,60 @@
 
     \endlist
 
-    \QC generates a UI file, \e Page1Form.ui.qml, that you can modify in the
-    \QMLD \uicontrol {Form Editor} and two QML files, \e Page1.qml and
-    \e main.qml, that you can modify in the \uicontrol {Text Editor} to add the
-    application logic. The \e .ui.qml file is created if you selected the
-    \uicontrol {With .ui.qml file} check box.
+    \QC generates a QML file, \e main.qml, that you can modify in \QMLD.
+
+    \section1 Creating Qt Quick Controls 2 Applications
+
+    \list 1
+
+        \li Select \uicontrol File > \uicontrol {New File or Project} >
+            \uicontrol Application > \uicontrol {Qt Quick Application - Scroll},
+            \uicontrol {Qt Quick Application - Stack}, or
+            \uicontrol {Qt Quick Application - Swipe} > \uicontrol Choose.
+
+        \li In the \uicontrol Name field, enter a name for the application.
+
+        \li In the \uicontrol {Create in} field, enter the path for the project
+            files, and then select \uicontrol Next (or \uicontrol Continue on
+            \macos).
+
+        \li In the \uicontrol {Build system} field, select the build system to
+            use for building and running the project: \l qmake,
+            \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}.
+
+        \li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of
+            the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use,
+            and then select \uicontrol Next.
+
+        \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add
+            support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html}
+            {Qt Virtual Keyboard} to the application.
+
+        \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
+            you want to build the application for. To build applications for
+            mobile devices, select kits for Android ARM and iPhone OS, and
+            click \uicontrol{Next}.
+
+            \note Kits are listed if they have been specified in \uicontrol
+            Tools > \uicontrol Options > \uicontrol {Build & Run} >
+            \uicontrol Kits (on Windows and Linux) or in \uicontrol {Qt Creator}
+            > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits
+            (on \macos).
+
+        \li Select \uicontrol Next.
+
+        \li Review the project settings, and click \uicontrol{Finish} (or
+            \uicontrol Done on \macos).
+
+    \endlist
+
+    For the Scroll application, \QC creates a QML file, \e main.qml, that you
+    can modify in \QMLD.
 
-    \include creator-tutorial-create-qq-project.qdocinc qt quick application
+    For the Stack and Swipe applications, \QC generates two UI files,
+    \e Page1Form.ui.qml and \e Page2Form.ui.qml, that you can modify in the
+    \QMLD \uicontrol {Form Editor} and a QML file, \e main.qml, that you can
+    modify in the \uicontrol {Text Editor} to add the application logic.
 
     \section1 Creating Qt Quick UI Projects
 
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index 7063351e25..8c835d12c0 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -120,8 +120,8 @@
     When you copy an item, all its child items are also copied. When
     you remove an item, the child items are also removed.
 
-    You can show and hide items to focus on specific parts of the application.
-    Click the \inlineimage icon_color_none.png
+    You can show and hide items on the canvas to focus on specific parts of the
+    application. Click the \inlineimage icon_color_none.png
     (\uicontrol Transparent) button to change the visibility of an item on the
     canvas. To change the
     visibility of an item in the application, select the \uicontrol Visibility
@@ -134,6 +134,9 @@
     As all properties, visibility and opacity are inherited from the parent
     item. To hide or show child items, edit the properties of the parent item.
 
+    To hide invisible items in the navigator, click \inlineimage filtericon.png
+    (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}.
+
     To reset item size, position, or anchors, select context menu commands. To
     change the source of an Image type, select \uicontrol {Change Source URL} in
     the context menu.
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
index 7a2061df13..35217c2553 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
@@ -29,7 +29,7 @@ import QtQuick.Controls.Styles 1.0
 import "../common"
 
 import QtQuick.Layouts 1.0
-import "../propertyEditorQmlSources/HelperWidgets"
+import HelperWidgets 2.0
 
 import QtQuickDesignerTheme 1.0
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentHorizontalButtons.qml
index af29773ce2..af29773ce2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentHorizontalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentVerticalButtons.qml
index ac3bd20f35..ac3bd20f35 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentVerticalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AnchorButtons.qml
index e7f9859ee4..e7f9859ee4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AnchorButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/BoolButtonRowButton.qml
index 2b413caaef..2b413caaef 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/BoolButtonRowButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Button.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
index 5f989d7e5f..5f989d7e5f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Button.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow.qml
index 95de97a6bb..95de97a6bb 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow2.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow2.qml
index 660c51dbee..660c51dbee 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow2.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow2.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml
index 8557552b53..8557552b53 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
index d69490d53a..d69490d53a 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
index 203e692a82..203e692a82 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorCheckButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorCheckButton.qml
index 941d705abd..941d705abd 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorCheckButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorCheckButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 583c324ac2..583c324ac2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLogic.qml
index 97c03ea921..97c03ea921 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLogic.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
index 08f76b4f25..08f76b4f25 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Constants.js
index 228bb1e4be..228bb1e4be 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Constants.js
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomCheckBoxStyle.qml
index bb0759d3f3..bb0759d3f3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomCheckBoxStyle.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomComboBoxStyle.qml
index 363ff65600..363ff65600 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomComboBoxStyle.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomSpinBoxStyle.qml
index f0a808b147..f0a808b147 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomSpinBoxStyle.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
index ca789fab43..ca789fab43 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpandingSpacer.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpandingSpacer.qml
index 9c456281f0..9c456281f0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpandingSpacer.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpandingSpacer.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpressionTextField.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml
index 697ec67ade..697ec67ade 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpressionTextField.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionButton.qml
index 492cf2f625..492cf2f625 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
index 7a90e89413..7a90e89413 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
index 6cca085da7..6cca085da7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
index 2af88020c6..2af88020c6 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontStyleButtons.qml
index 23e5db53e5..23e5db53e5 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontStyleButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml
index dd00c9d0a1..dd00c9d0a1 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GroupBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GroupBox.qml
index 943ec6bf37..943ec6bf37 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/HueSlider.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HueSlider.qml
index cb67d3a518..cb67d3a518 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/HueSlider.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HueSlider.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconLabel.qml
index 9306539a3b..9306539a3b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconLabel.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml
index 8498f838ac..8498f838ac 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
index aa62152eb0..aa62152eb0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/MarginSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
index 153d7cb27b..153d7cb27b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/MarginSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
index dab46aa0ce..dab46aa0ce 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/PaddingSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml
index 262e512f86..262e512f86 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/PaddingSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml
index 5b9459804f..5b9459804f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml
index 43c96f863b..7dc4a0e395 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml
@@ -25,7 +25,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0 as Controls
-import "../../common/"
+import "../../../common/"
 
 Controls.ScrollView {
     style: DesignerScrollViewStyle {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SecondColumnLayout.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml
index d7efcdb982..d7efcdb982 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SecondColumnLayout.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
index a4d01b64fe..a4d01b64fe 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SectionLayout.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml
index 6863ed39de..6863ed39de 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SectionLayout.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
index 2a07b05817..2a07b05817 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml
index 5fb4d612fb..5fb4d612fb 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Tab.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Tab.qml
index 79806d2bcc..79806d2bcc 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Tab.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Tab.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/TabView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TabView.qml
index 22c1923fad..22c1923fad 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/TabView.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TabView.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ToolTipArea.qml
index 9b51f1f4d3..9b51f1f4d3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ToolTipArea.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
index 0c89aa119e..0c89aa119e 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/checkers.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/checkers.png
index 72cb9f0350..72cb9f0350 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/checkers.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/checkers.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow.png
index a28f1e3713..a28f1e3713 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow@2x.png
index 6246fc2c29..6246fc2c29 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
index d13cf9fad9..d13cf9fad9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png
index 56244287a5..56244287a5 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_gradient.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_gradient.png
index 4360c84965..4360c84965 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_gradient.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_gradient.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_none.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_none.png
index 8fa7a86dc8..8fa7a86dc8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_none.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_none.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_solid.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_solid.png
index 0cf124e72e..0cf124e72e 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_solid.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_solid.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
index ae22d32b6e..ae22d32b6e 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png
index 305619812d..305619812d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
index 18be756dec..18be756dec 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png
index 58d6320b77..58d6320b77 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow.png
index 1379210685..1379210685 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow@2x.png
index 2f2fc05955..2f2fc05955 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir
index 2bb87380c3..2bb87380c3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir
diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
index c4985ba9df..769a43eb31 100644
--- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
+++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
@@ -26,7 +26,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
-import "../propertyEditorQmlSources/HelperWidgets"
+import HelperWidgets 2.0
 import QtQuickDesignerTheme 1.0
 
 Rectangle {
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 6bc596eacd..42558f65a4 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1044,15 +1044,20 @@ bool Check::visit(UiPublicMember *ast)
 {
     if (ast->type == UiPublicMember::Property) {
         if (ast->isValid()) {
-            const QStringRef name = ast->memberTypeName();
-            if (!name.isEmpty() && name.at(0).isLower()) {
-                const QString nameS = name.toString();
-                if (!isValidBuiltinPropertyType(nameS))
-                    addMessage(ErrInvalidPropertyType, ast->typeToken, nameS);
+            const QStringRef typeName = ast->memberTypeName();
+            if (!typeName.isEmpty() && typeName.at(0).isLower()) {
+                const QString typeNameS = typeName.toString();
+                if (!isValidBuiltinPropertyType(typeNameS))
+                    addMessage(ErrInvalidPropertyType, ast->typeToken, typeNameS);
             }
 
+            const QStringRef name = ast->name;
+
+            if (name == "data")
+                addMessage(ErrInvalidPropertyName, ast->identifierToken, name.toString());
+
             // warn about dubious use of var/variant
-            if (name == QLatin1String("variant") || name == QLatin1String("var")) {
+            if (typeName == QLatin1String("variant") || typeName == QLatin1String("var")) {
                 Evaluate evaluator(&_scopeChain);
                 const Value *init = evaluator(ast->statement);
                 QString preferredType;
diff --git a/src/libs/utils/navigationtreeview.cpp b/src/libs/utils/navigationtreeview.cpp
index 87037356cc..85490a9a17 100644
--- a/src/libs/utils/navigationtreeview.cpp
+++ b/src/libs/utils/navigationtreeview.cpp
@@ -27,6 +27,7 @@
 
 #include <QHeaderView>
 #include <QFocusEvent>
+#include <QScrollBar>
 
 /*!
    \class Utils::NavigationTreeView
@@ -56,6 +57,32 @@ NavigationTreeView::NavigationTreeView(QWidget *parent)
     header()->setStretchLastSection(false);
 }
 
+void NavigationTreeView::scrollTo(const QModelIndex &index, QAbstractItemView::ScrollHint hint)
+{
+    // work around QTBUG-3927
+    QScrollBar *hBar = horizontalScrollBar();
+    int scrollX = hBar->value();
+    const int viewportWidth = viewport()->width();
+    const QRect itemRect = visualRect(index);
+    if (itemRect.x() - indentation() < 0) {
+        // scroll so left edge minus one indent of item is visible
+        scrollX += itemRect.x() - indentation();
+    } else if (itemRect.right() > viewportWidth
+               && (viewportWidth - itemRect.x() < 3 * viewportWidth / 4)) {
+        // If right edge of item is not visible and left edge is "too far right",
+        // then move so it is either fully visible, or to the left edge.
+        // For this move the left edge one indent to the left, so the parent can potentially
+        // still be visible.
+        if (itemRect.width() + indentation() < viewportWidth)
+            scrollX += itemRect.right() - viewportWidth;
+        else
+            scrollX += itemRect.x() - indentation();
+    }
+    scrollX = qBound(hBar->minimum(), scrollX, hBar->maximum());
+    TreeView::scrollTo(index, hint);
+    hBar->setValue(scrollX);
+}
+
 // This is a workaround to stop Qt from redrawing the project tree every
 // time the user opens or closes a menu when it has focus. Would be nicer to
 // fix it in Qt.
diff --git a/src/libs/utils/navigationtreeview.h b/src/libs/utils/navigationtreeview.h
index 4718a96b3e..a99539d51b 100644
--- a/src/libs/utils/navigationtreeview.h
+++ b/src/libs/utils/navigationtreeview.h
@@ -36,11 +36,12 @@ class QTCREATOR_UTILS_EXPORT NavigationTreeView : public TreeView
     Q_OBJECT
 public:
     explicit NavigationTreeView(QWidget *parent = 0);
+    void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
 
 protected:
-    void focusInEvent(QFocusEvent *event);
-    void focusOutEvent(QFocusEvent *event);
-    void resizeEvent(QResizeEvent *event);
+    void focusInEvent(QFocusEvent *event) override;
+    void focusOutEvent(QFocusEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
 };
 
 } // Utils
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 4b023aeb0c..435c691dde 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -32,6 +32,7 @@
 #include <coreplugin/coreicons.h>
 #include <coreplugin/helpmanager.h>
 #include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtoutputformatter.h>
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
@@ -171,6 +172,13 @@ QString CMakeRunConfiguration::disabledReason() const
     return RunConfiguration::disabledReason();
 }
 
+Utils::OutputFormatter *CMakeRunConfiguration::createOutputFormatter() const
+{
+    if (QtSupport::QtKitInformation::qtVersion(target()->kit()))
+        return new QtSupport::QtOutputFormatter(target()->project());
+    return RunConfiguration::createOutputFormatter();
+}
+
 static void updateExecutable(CMakeRunConfiguration *rc, Utils::FancyLineEdit *fle)
 {
     const Runnable runnable = rc->runnable();
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
index 1b4ceffc23..1b04ebb531 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
@@ -54,6 +54,8 @@ public:
 
     QString buildSystemTarget() const final { return m_buildSystemTarget; }
 
+    Utils::OutputFormatter *createOutputFormatter() const final;
+
 private:
     void initialize(Core::Id id, const QString &target,
                const Utils::FileName &workingDirectory, const QString &title);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 2a5f56048f..7f185911e8 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -226,7 +226,6 @@ public:
                 this, &DebuggerEnginePrivate::resetLocation);
     }
 
-    void doSetupEngine();
     void doRunEngine();
     void doShutdownEngine();
     void doShutdownInferior();
@@ -512,8 +511,9 @@ void DebuggerEngine::start()
 //        });
 //    }
 
-    d->doSetupEngine();
-    QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
+    setState(EngineSetupRequested);
+    showMessage("CALL: SETUP ENGINE");
+    setupEngine();
 }
 
 void DebuggerEngine::resetLocation()
@@ -639,14 +639,9 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to)
 void DebuggerEngine::setupSlaveEngine()
 {
     QTC_CHECK(state() == DebuggerNotReady);
-    d->doSetupEngine();
-}
-
-void DebuggerEnginePrivate::doSetupEngine()
-{
-    m_engine->setState(EngineSetupRequested);
-    m_engine->showMessage("CALL: SETUP ENGINE");
-    m_engine->setupEngine();
+    setState(EngineSetupRequested);
+    showMessage("CALL: SETUP SLAVE ENGINE");
+    setupEngine();
 }
 
 void DebuggerEngine::notifyEngineSetupFailed()
@@ -676,6 +671,15 @@ void DebuggerEngine::notifyEngineSetupOk()
     setState(InferiorSetupRequested);
     showMessage("CALL: SETUP INFERIOR");
     d->m_progress.setProgressValue(250);
+    if (isMasterEngine())
+        setupInferior();
+}
+
+void DebuggerEngine::setupSlaveInferior()
+{
+    QTC_CHECK(state() == EngineSetupOk);
+    setState(InferiorSetupRequested);
+    showMessage("CALL: SETUP SLAVE INFERIOR");
     setupInferior();
 }
 
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 1dc3b9bfea..7de8bf8297 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -466,6 +466,7 @@ protected:
     void showStoppedByExceptionMessageBox(const QString &description);
 
     virtual void setupSlaveEngine();
+    virtual void setupSlaveInferior();
     virtual void runSlaveEngine();
     virtual void shutdownSlaveEngine();
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 34e1cbd931..40b92d0bac 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -565,6 +565,11 @@ void DebuggerRunTool::start()
                 cppEngine = createPdbEngine();
                 break;
             default:
+                if (!m_runParameters.isQmlDebugging) {
+                    reportFailure(DebuggerPlugin::tr("Unable to create a debugging engine. "
+                        "Please select a Debugger Setting from the Run page of the project mode."));
+                    return;
+                }
                 // Can happen for pure Qml.
                 break;
         }
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 7554a68d8b..27bcdb3f28 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -374,8 +374,8 @@ void QmlCppEngine::setupEngine()
 void QmlCppEngine::setupInferior()
 {
     EDEBUG("\nMASTER SETUP INFERIOR");
-    m_qmlEngine->setupInferior();
-    m_cppEngine->setupInferior();
+    m_qmlEngine->setupSlaveInferior();
+    m_cppEngine->setupSlaveInferior();
 }
 
 void QmlCppEngine::runEngine()
diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp
index 5262ffc66f..249f2bf329 100644
--- a/src/plugins/projectexplorer/abiwidget.cpp
+++ b/src/plugins/projectexplorer/abiwidget.cpp
@@ -154,8 +154,14 @@ AbiWidget::~AbiWidget()
 void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
 {
     QSignalBlocker blocker(this);
+
+    // Initial setup of ABI combobox:
     d->m_abi->clear();
+    d->m_abi->addItem(tr("<custom>"));
+    d->m_abi->setCurrentIndex(0);
+    d->m_abi->setVisible(!abiList.isEmpty());
 
+    // Set up custom ABI:
     Abi defaultAbi = current;
     if (defaultAbi.isNull()) {
         if (!abiList.isEmpty())
@@ -164,20 +170,20 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
             defaultAbi = Abi::hostAbi();
     }
 
-    d->m_abi->addItem(tr("<custom>"));
-    d->m_abi->setCurrentIndex(0);
     setCustomAbi(defaultAbi);
 
+    // Add supported ABIs:
     for (int i = 0; i < abiList.count(); ++i) {
-        int index = i + 1;
-        const QString abiString = abiList.at(i).toString();
+        const int index = i + 1;
+        const Abi abi = abiList.at(i);
+        const QString abiString = abi.toString();
 
         d->m_abi->insertItem(index, abiString, abiString);
-        if (abiList.at(i) == defaultAbi)
+        if (abi == defaultAbi)
             d->m_abi->setCurrentIndex(index);
     }
 
-    d->m_abi->setVisible(!abiList.isEmpty());
+    // Select a sensible ABI to start with if none was set yet.
     if (d->isCustom() && !current.isValid() && !abiList.isEmpty())
         d->m_abi->setCurrentIndex(1); // default to the first Abi if none is selected.
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index bd2bbaac51..372b072468 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -119,7 +119,7 @@ void BuildConfiguration::ctor()
 
 Utils::FileName BuildConfiguration::buildDirectory() const
 {
-    QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()));
+    const QString path = macroExpander()->expand(QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString())));
     return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path)));
 }
 
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 5a580d24e3..7308564924 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -54,7 +54,7 @@
 #include <memory>
 
 namespace {
-Q_LOGGING_CATEGORY(gccLog, "qtc.pe.toolchain.gcc");
+Q_LOGGING_CATEGORY(gccLog, "qtc.projectexplorer.toolchain.gcc");
 } // namespace
 
 using namespace Utils;
diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
index 5ccf569acd..251b383ee4 100644
--- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
@@ -44,7 +44,7 @@ QmlDesignerIconProvider::QmlDesignerIconProvider()
 
 static QString iconPath()
 {
-    return Core::ICore::resourcePath() + QLatin1String("/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/");
+    return Core::ICore::resourcePath() + QLatin1String("/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/");
 }
 
 QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
index d1afece6d0..86bd9b0d63 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
@@ -32,6 +32,8 @@
 #include <QGraphicsProxyWidget>
 #include <QCoreApplication>
 
+#include <QTimer>
+
 namespace QmlDesigner {
 
 FormEditorGraphicsView::FormEditorGraphicsView(QWidget *parent) :
@@ -142,17 +144,6 @@ void FormEditorGraphicsView::keyReleaseEvent(QKeyEvent *event)
     QGraphicsView::keyReleaseEvent(event);
 }
 
-void FormEditorGraphicsView::paintEvent(QPaintEvent *event)
-{
-    QGraphicsView::paintEvent(event);
-
-    if (m_blockPainting) {
-        QWidget::paintEvent(event);
-        QPainter painter(viewport());
-        painter.drawPixmap(0, 0, m_lastUpdate);
-    }
-}
-
 void FormEditorGraphicsView::startPanning(QEvent *event)
 {
     if (event->type() == QEvent::KeyPress)
@@ -213,15 +204,4 @@ void FormEditorGraphicsView::drawBackground(QPainter *painter, const QRectF &rec
     painter->restore();
 }
 
-void FormEditorGraphicsView::setBlockPainting(bool block)
-{
-    if (block)
-        m_lastUpdate = viewport()->grab();
-
-    m_blockPainting = block;
-
-    if (!block)
-        update();
-}
-
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
index 391c165c99..8387a78c41 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
@@ -40,7 +40,6 @@ public:
     void activateCheckboardBackground();
     void activateColoredBackground(const QColor &color);
     void drawBackground(QPainter *painter, const QRectF &rect) override;
-    void setBlockPainting(bool block);
 
 protected:
     bool eventFilter(QObject *watched, QEvent *event) override;
@@ -49,7 +48,6 @@ protected:
     void mouseReleaseEvent(QMouseEvent *event) override;
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
-    void paintEvent(QPaintEvent * event ) override;
 private:
     enum Panning{
         NotStarted, MouseWheelStarted, SpaceKeyStarted
@@ -60,8 +58,6 @@ private:
     Panning m_isPanning = Panning::NotStarted;
     QPoint m_panningStartPosition;
     QRectF m_rootItemRect;
-    bool m_blockPainting = false;
-    QPixmap m_lastUpdate;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 1ec725d6cd..99dc162f18 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -72,9 +72,9 @@ FormEditorView::~FormEditorView()
 void FormEditorView::modelAttached(Model *model)
 {
     Q_ASSERT(model);
+    temporaryBlockView();
 
     AbstractView::modelAttached(model);
-    temporaryBlockView();
 
     Q_ASSERT(m_scene->formLayerItem());
 
@@ -167,11 +167,13 @@ void FormEditorView::createFormEditorWidget()
 
 void FormEditorView::temporaryBlockView()
 {
-    formEditorWidget()->graphicsView()->setBlockPainting(true);
-
-    QTimer::singleShot(1000, this, [this]() {
-        formEditorWidget()->graphicsView()->setBlockPainting(false);
+    formEditorWidget()->graphicsView()->setUpdatesEnabled(false);
+    static QTimer *timer = new QTimer(qApp);
+    timer->setSingleShot(true);
+    timer->start(1000);
 
+    connect(timer, &QTimer::timeout, this, [this]() {
+        formEditorWidget()->graphicsView()->setUpdatesEnabled(true);
     });
 }
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 4364983608..1bf7725b98 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -60,6 +60,10 @@
 
 namespace QmlDesigner {
 
+static QString propertyEditorResourcesPath() {
+    return Core::ICore::resourcePath() + QStringLiteral("/qmldesigner/propertyEditorQmlSources");
+}
+
 ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
     QFrame(parent),
     m_itemIconSize(24, 24),
@@ -75,6 +79,8 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
 
     /* create Items view and its model */
     m_itemViewQuickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+
+    m_itemViewQuickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
     m_itemLibraryModel = new ItemLibraryModel(this);
 
     QQmlContext *rootContext = m_itemViewQuickWidget->rootContext();
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index 4fa195b3c5..a8e2b42e59 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -97,7 +97,7 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE
     m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance()
         ->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool());
 
-    m_view->engine()->addImportPath(propertyEditorResourcesPath());
+    m_view->engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
     m_dummyPropertyEditorValue->setValue(QLatin1String("#000000"));
     context()->setContextProperty(QLatin1String("dummyBackendValue"), m_dummyPropertyEditorValue.data());
     m_contextObject->setBackendValues(&m_backendValuesPropertyMap);
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
index 60e5ed419b..83d22c307d 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
@@ -56,6 +56,10 @@ enum {
 
 namespace QmlDesigner {
 
+static QString propertyEditorResourcesPath() {
+    return Core::ICore::resourcePath() + QStringLiteral("/qmldesigner/propertyEditorQmlSources");
+}
+
 int StatesEditorWidget::currentStateInternalId() const
 {
     QTC_ASSERT(rootObject(), return -1);
@@ -91,6 +95,7 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State
 
     engine()->addImageProvider(QStringLiteral("qmldesigner_stateseditor"), m_imageProvider);
     engine()->addImportPath(qmlSourcesPath());
+    engine()->addImportPath(propertyEditorResourcesPath() + "/imports");
 
     m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F4), this);
     connect(m_qmlSourceUpdateShortcut, &QShortcut::activated, this, &StatesEditorWidget::reloadQmlSource);
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 561910006c..3b9ddf99c9 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -260,6 +260,8 @@ void ModelPrivate::removeNodeFromModel(const InternalNodePointer &internalNodePo
 
     internalNodePointer->resetParentProperty();
 
+
+    m_selectedInternalNodeList.removeAll(internalNodePointer);
     if (!internalNodePointer->id().isEmpty())
         m_idNodeHash.remove(internalNodePointer->id());
     internalNodePointer->setValid(false);
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 115bdc68a0..0aa965fbf4 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -6921,11 +6921,11 @@ void tst_Dumpers::dumper_data()
 
     QTest::newRow("StringDisplay")
             << Data("#include <string.h>\n"
-                    "struct QtcDumperTest_String"
+                    "struct QtcDumperTest_String\n"
                     "{\n"
                     "   char *first;\n"
                     "   const char *second = \"second\";\n"
-                    "   const char third[6] = \"third\";\n"
+                    "   const char third[6] = {'t','h','i','r','d','\0'};\n"
                     "   QtcDumperTest_String()\n"
                     "   {\n"
                     "      first = new char[6];\n"