Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/quickcontrols/extras/flat/main.cpp
	src/controls/Private/qquickcontrolsettings.cpp

Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc

196 files changed, 272 insertions, 5 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index c80af37f0..a561399ae 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,2 @@
 TEMPLATE = subdirs
-
-SUBDIRS += quick/controls
-SUBDIRS += quick/dialogs
-SUBDIRS += quick/extras
+SUBDIRS = quickcontrols
diff --git a/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro b/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro
new file mode 100644
index 000000000..202a899fa
--- /dev/null
+++ b/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro
@@ -0,0 +1,15 @@
+QT += qml quick
+TARGET = basiclayouts
+!no_desktop: QT += widgets
+
+include(src/src.pri)
+include(../shared/shared.pri)
+
+OTHER_FILES += \
+    main.qml
+
+RESOURCES += \
+    resources.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/basiclayouts
+INSTALLS += target
diff --git a/examples/quick/controls/touch/touch.qmlproject b/examples/quickcontrols/controls/basiclayouts/basiclayouts.qmlproject
index e5a8bf02c..e5a8bf02c 100644
--- a/examples/quick/controls/touch/touch.qmlproject
+++ b/examples/quickcontrols/controls/basiclayouts/basiclayouts.qmlproject
diff --git a/examples/quickcontrols/controls/basiclayouts/main.qml b/examples/quickcontrols/controls/basiclayouts/main.qml
new file mode 100644
index 000000000..b6694b454
--- /dev/null
+++ b/examples/quickcontrols/controls/basiclayouts/main.qml
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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.2
+import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.3
+
+ApplicationWindow {
+    visible: true
+    title: "Basic layouts"
+    property int margin: 11
+    width: mainLayout.implicitWidth + 2 * margin
+    height: mainLayout.implicitHeight + 2 * margin
+    minimumWidth: mainLayout.Layout.minimumWidth + 2 * margin
+    minimumHeight: mainLayout.Layout.minimumHeight + 2 * margin
+
+    ColumnLayout {
+        id: mainLayout
+        anchors.fill: parent
+        anchors.margins: margin
+        GroupBox {
+            id: rowBox
+            title: "Row layout"
+            Layout.fillWidth: true
+
+            RowLayout {
+                id: rowLayout
+                anchors.fill: parent
+                TextField {
+                    placeholderText: "This wants to grow horizontally"
+                    Layout.fillWidth: true
+                }
+                Button {
+                    text: "Button"
+                }
+            }
+        }
+
+        GroupBox {
+            id: gridBox
+            title: "Grid layout"
+            Layout.fillWidth: true
+
+            GridLayout {
+                id: gridLayout
+                rows: 3
+                flow: GridLayout.TopToBottom
+                anchors.fill: parent
+
+                Label { text: "Line 1" }
+                Label { text: "Line 2" }
+                Label { text: "Line 3" }
+
+                TextField { }
+                TextField { }
+                TextField { }
+
+                TextArea {
+                    text: "This widget spans over three rows in the GridLayout.\n"
+                        + "All items in the GridLayout are implicitly positioned from top to bottom."
+                    Layout.rowSpan: 3
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+                }
+            }
+        }
+        TextArea {
+            id: t3
+            text: "This fills the whole cell"
+            Layout.minimumHeight: 30
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+        }
+        GroupBox {
+            id: stackBox
+            title: "Stack layout"
+            implicitWidth: 200
+            implicitHeight: 60
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            StackLayout {
+                id: stackLayout
+                anchors.fill: parent
+
+                function advance() { currentIndex = (currentIndex + 1) % count }
+
+                Repeater {
+                    id: stackRepeater
+                    model: 5
+                    Rectangle {
+                        color: Qt.hsla((0.5 + index)/stackRepeater.count, 0.3, 0.7, 1)
+                        Button { anchors.centerIn: parent; text: "Page " + (index + 1); onClicked: { stackLayout.advance() } }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/quick/controls/tableview/tableview.qrc b/examples/quickcontrols/controls/basiclayouts/resources.qrc
index 3b111a907..3b111a907 100644
--- a/examples/quick/controls/tableview/tableview.qrc
+++ b/examples/quickcontrols/controls/basiclayouts/resources.qrc
diff --git a/examples/quick/controls/touch/src/main.cpp b/examples/quickcontrols/controls/basiclayouts/src/main.cpp
index f1b6ca77b..f1b6ca77b 100644
--- a/examples/quick/controls/touch/src/main.cpp
+++ b/examples/quickcontrols/controls/basiclayouts/src/main.cpp
diff --git a/examples/quick/controls/touch/src/src.pri b/examples/quickcontrols/controls/basiclayouts/src/src.pri
index 66d903eac..66d903eac 100644
--- a/examples/quick/controls/touch/src/src.pri
+++ b/examples/quickcontrols/controls/basiclayouts/src/src.pri
diff --git a/examples/quick/controls/calendar/calendar.pro b/examples/quickcontrols/controls/calendar/calendar.pro
index e5bee1e97..67960e275 100644
--- a/examples/quick/controls/calendar/calendar.pro
+++ b/examples/quickcontrols/controls/calendar/calendar.pro
@@ -9,3 +9,6 @@ include(../shared/shared.pri)
 OTHER_FILES += qml/main.qml
 
 RESOURCES += resources.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/calendar
+INSTALLS += target
diff --git a/examples/quick/controls/calendar/images/eventindicator.png b/examples/quickcontrols/controls/calendar/images/eventindicator.png
index 1edffd02d..1edffd02d 100644
--- a/examples/quick/controls/calendar/images/eventindicator.png
+++ b/examples/quickcontrols/controls/calendar/images/eventindicator.png
diff --git a/examples/quick/controls/calendar/qml/main.qml b/examples/quickcontrols/controls/calendar/qml/main.qml
index 5c4c10e87..5c4c10e87 100644
--- a/examples/quick/controls/calendar/qml/main.qml
+++ b/examples/quickcontrols/controls/calendar/qml/main.qml
diff --git a/examples/quick/controls/calendar/resources.qrc b/examples/quickcontrols/controls/calendar/resources.qrc
index 9da283ba3..9da283ba3 100644
--- a/examples/quick/controls/calendar/resources.qrc
+++ b/examples/quickcontrols/controls/calendar/resources.qrc
diff --git a/examples/quick/controls/calendar/src/event.cpp b/examples/quickcontrols/controls/calendar/src/event.cpp
index 3e5f641e7..3e5f641e7 100644
--- a/examples/quick/controls/calendar/src/event.cpp
+++ b/examples/quickcontrols/controls/calendar/src/event.cpp
diff --git a/examples/quick/controls/calendar/src/event.h b/examples/quickcontrols/controls/calendar/src/event.h
index 8e7b3284e..8e7b3284e 100644
--- a/examples/quick/controls/calendar/src/event.h
+++ b/examples/quickcontrols/controls/calendar/src/event.h
diff --git a/examples/quick/controls/calendar/src/main.cpp b/examples/quickcontrols/controls/calendar/src/main.cpp
index c9613d5fe..c9613d5fe 100644
--- a/examples/quick/controls/calendar/src/main.cpp
+++ b/examples/quickcontrols/controls/calendar/src/main.cpp
diff --git a/examples/quick/controls/calendar/src/sqleventmodel.cpp b/examples/quickcontrols/controls/calendar/src/sqleventmodel.cpp
index d7cad179a..d7cad179a 100644
--- a/examples/quick/controls/calendar/src/sqleventmodel.cpp
+++ b/examples/quickcontrols/controls/calendar/src/sqleventmodel.cpp
diff --git a/examples/quick/controls/calendar/src/sqleventmodel.h b/examples/quickcontrols/controls/calendar/src/sqleventmodel.h
index 788dbf2ac..788dbf2ac 100644
--- a/examples/quick/controls/calendar/src/sqleventmodel.h
+++ b/examples/quickcontrols/controls/calendar/src/sqleventmodel.h
diff --git a/examples/quick/controls/calendar/src/src.pri b/examples/quickcontrols/controls/calendar/src/src.pri
index 50b2ea620..50b2ea620 100644
--- a/examples/quick/controls/calendar/src/src.pri
+++ b/examples/quickcontrols/controls/calendar/src/src.pri
diff --git a/examples/quick/controls/controls.pro b/examples/quickcontrols/controls/controls.pro
index 57c679c9d..381e71408 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quickcontrols/controls/controls.pro
@@ -14,3 +14,6 @@ qtHaveModule(widgets) {
 qtHaveModule(sql) {
     SUBDIRS += calendar
 }
+
+EXAMPLE_FILES += \
+    shared
diff --git a/examples/quick/controls/filesystembrowser/filesystembrowser.pro b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro
index bf77d958f..fc14584cd 100644
--- a/examples/quick/controls/filesystembrowser/filesystembrowser.pro
+++ b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro
@@ -5,3 +5,6 @@ QT += qml quick widgets
 SOURCES += main.cpp
 
 RESOURCES += qml.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/filesystembrowser
+INSTALLS += target
diff --git a/examples/quick/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp
index 6027c828d..6027c828d 100644
--- a/examples/quick/controls/filesystembrowser/main.cpp
+++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp
diff --git a/examples/quick/controls/filesystembrowser/main.qml b/examples/quickcontrols/controls/filesystembrowser/main.qml
index b07b842bc..b07b842bc 100644
--- a/examples/quick/controls/filesystembrowser/main.qml
+++ b/examples/quickcontrols/controls/filesystembrowser/main.qml
diff --git a/examples/quick/controls/filesystembrowser/qml.qrc b/examples/quickcontrols/controls/filesystembrowser/qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/quick/controls/filesystembrowser/qml.qrc
+++ b/examples/quickcontrols/controls/filesystembrowser/qml.qrc
diff --git a/examples/quick/controls/gallery/gallery.pro b/examples/quickcontrols/controls/gallery/gallery.pro
index f13f42135..5cba235da 100644
--- a/examples/quick/controls/gallery/gallery.pro
+++ b/examples/quickcontrols/controls/gallery/gallery.pro
@@ -18,3 +18,6 @@ OTHER_FILES += \
     qml/+osx/UI.js
 
 include(../shared/shared.pri)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/gallery
+INSTALLS += target
diff --git a/examples/quick/controls/gallery/gallery.qrc b/examples/quickcontrols/controls/gallery/gallery.qrc
index 873c8b5ca..873c8b5ca 100644
--- a/examples/quick/controls/gallery/gallery.qrc
+++ b/examples/quickcontrols/controls/gallery/gallery.qrc
diff --git a/examples/quick/controls/gallery/main.cpp b/examples/quickcontrols/controls/gallery/main.cpp
index adcdfe529..adcdfe529 100644
--- a/examples/quick/controls/gallery/main.cpp
+++ b/examples/quickcontrols/controls/gallery/main.cpp
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quickcontrols/controls/gallery/main.qml
index a8bbbaf21..a8bbbaf21 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quickcontrols/controls/gallery/main.qml
diff --git a/examples/quick/controls/gallery/qml/+android/UI.js b/examples/quickcontrols/controls/gallery/qml/+android/UI.js
index be7ddfa96..be7ddfa96 100644
--- a/examples/quick/controls/gallery/qml/+android/UI.js
+++ b/examples/quickcontrols/controls/gallery/qml/+android/UI.js
diff --git a/examples/quick/controls/gallery/qml/+ios/UI.js b/examples/quickcontrols/controls/gallery/qml/+ios/UI.js
index be7ddfa96..be7ddfa96 100644
--- a/examples/quick/controls/gallery/qml/+ios/UI.js
+++ b/examples/quickcontrols/controls/gallery/qml/+ios/UI.js
diff --git a/examples/quick/controls/gallery/qml/+osx/UI.js b/examples/quickcontrols/controls/gallery/qml/+osx/UI.js
index 28b13b64a..28b13b64a 100644
--- a/examples/quick/controls/gallery/qml/+osx/UI.js
+++ b/examples/quickcontrols/controls/gallery/qml/+osx/UI.js
diff --git a/examples/quick/controls/gallery/qml/ButtonPage.qml b/examples/quickcontrols/controls/gallery/qml/ButtonPage.qml
index 8eb9c1a73..8eb9c1a73 100644
--- a/examples/quick/controls/gallery/qml/ButtonPage.qml
+++ b/examples/quickcontrols/controls/gallery/qml/ButtonPage.qml
diff --git a/examples/quick/controls/gallery/qml/InputPage.qml b/examples/quickcontrols/controls/gallery/qml/InputPage.qml
index 78ef0a64d..78ef0a64d 100644
--- a/examples/quick/controls/gallery/qml/InputPage.qml
+++ b/examples/quickcontrols/controls/gallery/qml/InputPage.qml
diff --git a/examples/quick/controls/gallery/qml/ProgressPage.qml b/examples/quickcontrols/controls/gallery/qml/ProgressPage.qml
index 5123d101f..5123d101f 100644
--- a/examples/quick/controls/gallery/qml/ProgressPage.qml
+++ b/examples/quickcontrols/controls/gallery/qml/ProgressPage.qml
diff --git a/examples/quick/controls/gallery/qml/UI.js b/examples/quickcontrols/controls/gallery/qml/UI.js
index 3899ced02..3899ced02 100644
--- a/examples/quick/controls/gallery/qml/UI.js
+++ b/examples/quickcontrols/controls/gallery/qml/UI.js
diff --git a/examples/quick/controls/shared/qtquickcontrolsapplication.h b/examples/quickcontrols/controls/shared/qtquickcontrolsapplication.h
index 04d104442..04d104442 100644
--- a/examples/quick/controls/shared/qtquickcontrolsapplication.h
+++ b/examples/quickcontrols/controls/shared/qtquickcontrolsapplication.h
diff --git a/examples/quick/controls/shared/shared.pri b/examples/quickcontrols/controls/shared/shared.pri
index 1d9e0592f..1d9e0592f 100644
--- a/examples/quick/controls/shared/shared.pri
+++ b/examples/quickcontrols/controls/shared/shared.pri
diff --git a/examples/quick/controls/styles/images/bubble.png b/examples/quickcontrols/controls/styles/images/bubble.png
index 62aa1efe5..62aa1efe5 100644
--- a/examples/quick/controls/styles/images/bubble.png
+++ b/examples/quickcontrols/controls/styles/images/bubble.png
diff --git a/examples/quick/controls/styles/images/button-pressed.png b/examples/quickcontrols/controls/styles/images/button-pressed.png
index d64cdaa78..d64cdaa78 100644
--- a/examples/quick/controls/styles/images/button-pressed.png
+++ b/examples/quickcontrols/controls/styles/images/button-pressed.png
diff --git a/examples/quick/controls/styles/images/button.png b/examples/quickcontrols/controls/styles/images/button.png
index 8ab41cc80..8ab41cc80 100644
--- a/examples/quick/controls/styles/images/button.png
+++ b/examples/quickcontrols/controls/styles/images/button.png
diff --git a/examples/quick/controls/styles/images/progress-background.png b/examples/quickcontrols/controls/styles/images/progress-background.png
index 55a069dfc..55a069dfc 100644
--- a/examples/quick/controls/styles/images/progress-background.png
+++ b/examples/quickcontrols/controls/styles/images/progress-background.png
diff --git a/examples/quick/controls/styles/images/progress-fill.png b/examples/quickcontrols/controls/styles/images/progress-fill.png
index b588c9586..b588c9586 100644
--- a/examples/quick/controls/styles/images/progress-fill.png
+++ b/examples/quickcontrols/controls/styles/images/progress-fill.png
diff --git a/examples/quick/controls/styles/images/slider-handle.png b/examples/quickcontrols/controls/styles/images/slider-handle.png
index ac4d4a0d9..ac4d4a0d9 100644
--- a/examples/quick/controls/styles/images/slider-handle.png
+++ b/examples/quickcontrols/controls/styles/images/slider-handle.png
diff --git a/examples/quick/controls/styles/images/tab.png b/examples/quickcontrols/controls/styles/images/tab.png
index 74fefab78..74fefab78 100644
--- a/examples/quick/controls/styles/images/tab.png
+++ b/examples/quickcontrols/controls/styles/images/tab.png
diff --git a/examples/quick/controls/styles/images/tab_selected.png b/examples/quickcontrols/controls/styles/images/tab_selected.png
index 665400ccf..665400ccf 100644
--- a/examples/quick/controls/styles/images/tab_selected.png
+++ b/examples/quickcontrols/controls/styles/images/tab_selected.png
diff --git a/examples/quick/controls/styles/images/textfield.png b/examples/quickcontrols/controls/styles/images/textfield.png
index 1d4a38ab3..1d4a38ab3 100644
--- a/examples/quick/controls/styles/images/textfield.png
+++ b/examples/quickcontrols/controls/styles/images/textfield.png
diff --git a/examples/quick/controls/styles/main.cpp b/examples/quickcontrols/controls/styles/main.cpp
index 47e9945d7..47e9945d7 100644
--- a/examples/quick/controls/styles/main.cpp
+++ b/examples/quickcontrols/controls/styles/main.cpp
diff --git a/examples/quick/controls/styles/main.qml b/examples/quickcontrols/controls/styles/main.qml
index c77628839..c77628839 100644
--- a/examples/quick/controls/styles/main.qml
+++ b/examples/quickcontrols/controls/styles/main.qml
diff --git a/examples/quick/controls/styles/styles.pro b/examples/quickcontrols/controls/styles/styles.pro
index 03648f4cc..b1b29951d 100644
--- a/examples/quick/controls/styles/styles.pro
+++ b/examples/quickcontrols/controls/styles/styles.pro
@@ -8,3 +8,6 @@ RESOURCES += \
     styles.qrc
 OTHER_FILES += \
     main.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/styles
+INSTALLS += target
diff --git a/examples/quick/controls/styles/styles.qrc b/examples/quickcontrols/controls/styles/styles.qrc
index d2300c6fa..d2300c6fa 100644
--- a/examples/quick/controls/styles/styles.qrc
+++ b/examples/quickcontrols/controls/styles/styles.qrc
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quickcontrols/controls/tableview/main.qml
index 006fad6db..006fad6db 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quickcontrols/controls/tableview/main.qml
diff --git a/examples/quick/controls/tableview/src/main.cpp b/examples/quickcontrols/controls/tableview/src/main.cpp
index 5292a609a..5292a609a 100644
--- a/examples/quick/controls/tableview/src/main.cpp
+++ b/examples/quickcontrols/controls/tableview/src/main.cpp
diff --git a/examples/quick/controls/tableview/src/sortfilterproxymodel.cpp b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp
index 55f76d670..55f76d670 100644
--- a/examples/quick/controls/tableview/src/sortfilterproxymodel.cpp
+++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp
diff --git a/examples/quick/controls/tableview/src/sortfilterproxymodel.h b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.h
index dbc73e847..dbc73e847 100644
--- a/examples/quick/controls/tableview/src/sortfilterproxymodel.h
+++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.h
diff --git a/examples/quick/controls/tableview/src/src.pri b/examples/quickcontrols/controls/tableview/src/src.pri
index 491f851c9..491f851c9 100644
--- a/examples/quick/controls/tableview/src/src.pri
+++ b/examples/quickcontrols/controls/tableview/src/src.pri
diff --git a/examples/quick/controls/tableview/tableview.pro b/examples/quickcontrols/controls/tableview/tableview.pro
index c0ed1a2f9..a956dc428 100644
--- a/examples/quick/controls/tableview/tableview.pro
+++ b/examples/quickcontrols/controls/tableview/tableview.pro
@@ -9,3 +9,6 @@ OTHER_FILES += \
 
 include(src/src.pri)
 include(../shared/shared.pri)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/tableview
+INSTALLS += target
diff --git a/examples/quickcontrols/controls/tableview/tableview.qrc b/examples/quickcontrols/controls/tableview/tableview.qrc
new file mode 100644
index 000000000..3b111a907
--- /dev/null
+++ b/examples/quickcontrols/controls/tableview/tableview.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>main.qml</file>
+</qresource>
+</RCC>
diff --git a/examples/quick/controls/texteditor/example.html b/examples/quickcontrols/controls/texteditor/example.html
index 52bb507a1..52bb507a1 100644
--- a/examples/quick/controls/texteditor/example.html
+++ b/examples/quickcontrols/controls/texteditor/example.html
diff --git a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml b/examples/quickcontrols/controls/texteditor/qml/ToolBarSeparator.qml
index cb4ae0243..cb4ae0243 100644
--- a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
+++ b/examples/quickcontrols/controls/texteditor/qml/ToolBarSeparator.qml
diff --git a/examples/quick/controls/texteditor/qml/images/editcopy.png b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png
index f55136446..f55136446 100644
--- a/examples/quick/controls/texteditor/qml/images/editcopy.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png
diff --git a/examples/quick/controls/texteditor/qml/images/editcut.png b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png
index a784fd570..a784fd570 100644
--- a/examples/quick/controls/texteditor/qml/images/editcut.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png
diff --git a/examples/quick/controls/texteditor/qml/images/editpaste.png b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png
index 64c0b2d6a..64c0b2d6a 100644
--- a/examples/quick/controls/texteditor/qml/images/editpaste.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png
diff --git a/examples/quick/controls/texteditor/qml/images/editredo.png b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png
index 8875bf246..8875bf246 100644
--- a/examples/quick/controls/texteditor/qml/images/editredo.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png
diff --git a/examples/quick/controls/texteditor/qml/images/editundo.png b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png
index a3bd5e0bf..a3bd5e0bf 100644
--- a/examples/quick/controls/texteditor/qml/images/editundo.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png
diff --git a/examples/quick/controls/texteditor/qml/images/exportpdf.png b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png
index ebb44e6b8..ebb44e6b8 100644
--- a/examples/quick/controls/texteditor/qml/images/exportpdf.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png
diff --git a/examples/quick/controls/texteditor/qml/images/filenew.png b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png
index d3882c7b3..d3882c7b3 100644
--- a/examples/quick/controls/texteditor/qml/images/filenew.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png
diff --git a/examples/quick/controls/texteditor/qml/images/fileopen.png b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png
index fc06c5ec6..fc06c5ec6 100644
--- a/examples/quick/controls/texteditor/qml/images/fileopen.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png
diff --git a/examples/quick/controls/texteditor/qml/images/fileprint.png b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png
index 10ca56c82..10ca56c82 100644
--- a/examples/quick/controls/texteditor/qml/images/fileprint.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png
diff --git a/examples/quick/controls/texteditor/qml/images/filesave.png b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png
index b41ecf531..b41ecf531 100644
--- a/examples/quick/controls/texteditor/qml/images/filesave.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png
diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png
index be1bb1060..be1bb1060 100644
--- a/examples/quick/controls/texteditor/qml/images/qt-logo.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png
diff --git a/examples/quick/controls/texteditor/qml/images/textbold.png b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png
index 38400bd1f..38400bd1f 100644
--- a/examples/quick/controls/texteditor/qml/images/textbold.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png
diff --git a/examples/quick/controls/texteditor/qml/images/textcenter.png b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png
index 2ef5b2ee6..2ef5b2ee6 100644
--- a/examples/quick/controls/texteditor/qml/images/textcenter.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png
diff --git a/examples/quick/controls/texteditor/qml/images/textitalic.png b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png
index 0170ee26a..0170ee26a 100644
--- a/examples/quick/controls/texteditor/qml/images/textitalic.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png
diff --git a/examples/quick/controls/texteditor/qml/images/textjustify.png b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png
index 39cd6c1a9..39cd6c1a9 100644
--- a/examples/quick/controls/texteditor/qml/images/textjustify.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png
diff --git a/examples/quick/controls/texteditor/qml/images/textleft.png b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png
index 83a66d553..83a66d553 100644
--- a/examples/quick/controls/texteditor/qml/images/textleft.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png
diff --git a/examples/quick/controls/texteditor/qml/images/textright.png b/examples/quickcontrols/controls/texteditor/qml/images/textright.png
index e7c04645c..e7c04645c 100644
--- a/examples/quick/controls/texteditor/qml/images/textright.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textright.png
diff --git a/examples/quick/controls/texteditor/qml/images/textunder.png b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png
index 968bac5e9..968bac5e9 100644
--- a/examples/quick/controls/texteditor/qml/images/textunder.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png
diff --git a/examples/quick/controls/texteditor/qml/images/zoomin.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png
index d46f5aff0..d46f5aff0 100644
--- a/examples/quick/controls/texteditor/qml/images/zoomin.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png
diff --git a/examples/quick/controls/texteditor/qml/images/zoomout.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png
index 46326566d..46326566d 100644
--- a/examples/quick/controls/texteditor/qml/images/zoomout.png
+++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png
diff --git a/examples/quick/controls/texteditor/qml/main.qml b/examples/quickcontrols/controls/texteditor/qml/main.qml
index 8aa9ee7be..8aa9ee7be 100644
--- a/examples/quick/controls/texteditor/qml/main.qml
+++ b/examples/quickcontrols/controls/texteditor/qml/main.qml
diff --git a/examples/quick/controls/texteditor/resources.qrc b/examples/quickcontrols/controls/texteditor/resources.qrc
index 27c7b9215..27c7b9215 100644
--- a/examples/quick/controls/texteditor/resources.qrc
+++ b/examples/quickcontrols/controls/texteditor/resources.qrc
diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
index bdecf5ba1..bdecf5ba1 100644
--- a/examples/quick/controls/texteditor/src/documenthandler.cpp
+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
diff --git a/examples/quick/controls/texteditor/src/documenthandler.h b/examples/quickcontrols/controls/texteditor/src/documenthandler.h
index 682c8b5bd..682c8b5bd 100644
--- a/examples/quick/controls/texteditor/src/documenthandler.h
+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.h
diff --git a/examples/quick/controls/texteditor/src/main.cpp b/examples/quickcontrols/controls/texteditor/src/main.cpp
index 30113bbfc..30113bbfc 100644
--- a/examples/quick/controls/texteditor/src/main.cpp
+++ b/examples/quickcontrols/controls/texteditor/src/main.cpp
diff --git a/examples/quick/controls/texteditor/src/src.pri b/examples/quickcontrols/controls/texteditor/src/src.pri
index 2b89cd629..2b89cd629 100644
--- a/examples/quick/controls/texteditor/src/src.pri
+++ b/examples/quickcontrols/controls/texteditor/src/src.pri
diff --git a/examples/quick/controls/texteditor/texteditor.pro b/examples/quickcontrols/controls/texteditor/texteditor.pro
index ec9d8d863..f52552555 100644
--- a/examples/quick/controls/texteditor/texteditor.pro
+++ b/examples/quickcontrols/controls/texteditor/texteditor.pro
@@ -11,3 +11,6 @@ OTHER_FILES += \
 
 RESOURCES += \
     resources.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/texteditor
+INSTALLS += target
diff --git a/examples/quick/controls/touch/content/AndroidDelegate.qml b/examples/quickcontrols/controls/touch/content/AndroidDelegate.qml
index 7eb2a5fd0..7eb2a5fd0 100644
--- a/examples/quick/controls/touch/content/AndroidDelegate.qml
+++ b/examples/quickcontrols/controls/touch/content/AndroidDelegate.qml
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quickcontrols/controls/touch/content/ButtonPage.qml
index aa37b6676..aa37b6676 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quickcontrols/controls/touch/content/ButtonPage.qml
diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quickcontrols/controls/touch/content/ListPage.qml
index 5f1675df1..5f1675df1 100644
--- a/examples/quick/controls/touch/content/ListPage.qml
+++ b/examples/quickcontrols/controls/touch/content/ListPage.qml
diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quickcontrols/controls/touch/content/ProgressBarPage.qml
index 5cee2e337..5cee2e337 100644
--- a/examples/quick/controls/touch/content/ProgressBarPage.qml
+++ b/examples/quickcontrols/controls/touch/content/ProgressBarPage.qml
diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quickcontrols/controls/touch/content/SliderPage.qml
index 4c558f75b..4c558f75b 100644
--- a/examples/quick/controls/touch/content/SliderPage.qml
+++ b/examples/quickcontrols/controls/touch/content/SliderPage.qml
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quickcontrols/controls/touch/content/TabBarPage.qml
index 6e7ec69c1..6e7ec69c1 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quickcontrols/controls/touch/content/TabBarPage.qml
diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quickcontrols/controls/touch/content/TextInputPage.qml
index 3a69cc188..3a69cc188 100644
--- a/examples/quick/controls/touch/content/TextInputPage.qml
+++ b/examples/quickcontrols/controls/touch/content/TextInputPage.qml
diff --git a/examples/quick/controls/touch/images/NOTICE.txt b/examples/quickcontrols/controls/touch/images/NOTICE.txt
index 93a9afc8c..93a9afc8c 100644
--- a/examples/quick/controls/touch/images/NOTICE.txt
+++ b/examples/quickcontrols/controls/touch/images/NOTICE.txt
diff --git a/examples/quick/controls/touch/images/button_default.png b/examples/quickcontrols/controls/touch/images/button_default.png
index 6d6cfd9ad..6d6cfd9ad 100644
--- a/examples/quick/controls/touch/images/button_default.png
+++ b/examples/quickcontrols/controls/touch/images/button_default.png
diff --git a/examples/quick/controls/touch/images/button_pressed.png b/examples/quickcontrols/controls/touch/images/button_pressed.png
index ab78b6ea3..ab78b6ea3 100644
--- a/examples/quick/controls/touch/images/button_pressed.png
+++ b/examples/quickcontrols/controls/touch/images/button_pressed.png
diff --git a/examples/quick/controls/touch/images/navigation_next_item.png b/examples/quickcontrols/controls/touch/images/navigation_next_item.png
index 6665c9d85..6665c9d85 100644
--- a/examples/quick/controls/touch/images/navigation_next_item.png
+++ b/examples/quickcontrols/controls/touch/images/navigation_next_item.png
diff --git a/examples/quick/controls/touch/images/navigation_previous_item.png b/examples/quickcontrols/controls/touch/images/navigation_previous_item.png
index f8be01197..f8be01197 100644
--- a/examples/quick/controls/touch/images/navigation_previous_item.png
+++ b/examples/quickcontrols/controls/touch/images/navigation_previous_item.png
diff --git a/examples/quick/controls/touch/images/tab_selected.png b/examples/quickcontrols/controls/touch/images/tab_selected.png
index 2345f7a8e..2345f7a8e 100644
--- a/examples/quick/controls/touch/images/tab_selected.png
+++ b/examples/quickcontrols/controls/touch/images/tab_selected.png
diff --git a/examples/quick/controls/touch/images/tabs_standard.png b/examples/quickcontrols/controls/touch/images/tabs_standard.png
index 7140ab7b7..7140ab7b7 100644
--- a/examples/quick/controls/touch/images/tabs_standard.png
+++ b/examples/quickcontrols/controls/touch/images/tabs_standard.png
diff --git a/examples/quick/controls/touch/images/textinput.png b/examples/quickcontrols/controls/touch/images/textinput.png
index b0256db2c..b0256db2c 100644
--- a/examples/quick/controls/touch/images/textinput.png
+++ b/examples/quickcontrols/controls/touch/images/textinput.png
diff --git a/examples/quick/controls/touch/images/toolbar.png b/examples/quickcontrols/controls/touch/images/toolbar.png
index e9eba4c74..e9eba4c74 100644
--- a/examples/quick/controls/touch/images/toolbar.png
+++ b/examples/quickcontrols/controls/touch/images/toolbar.png
diff --git a/examples/quick/controls/touch/main.qml b/examples/quickcontrols/controls/touch/main.qml
index bd57c40e4..bd57c40e4 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quickcontrols/controls/touch/main.qml
diff --git a/examples/quick/controls/touch/resources.qrc b/examples/quickcontrols/controls/touch/resources.qrc
index e64a063f1..e64a063f1 100644
--- a/examples/quick/controls/touch/resources.qrc
+++ b/examples/quickcontrols/controls/touch/resources.qrc
diff --git a/examples/quickcontrols/controls/touch/src/main.cpp b/examples/quickcontrols/controls/touch/src/main.cpp
new file mode 100644
index 000000000..e66387f7b
--- /dev/null
+++ b/examples/quickcontrols/controls/touch/src/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 "qtquickcontrolsapplication.h"
+#include <QtQml/QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QtQuickControlsApplication app(argc, argv);
+    QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+    return app.exec();
+}
diff --git a/examples/quickcontrols/controls/touch/src/src.pri b/examples/quickcontrols/controls/touch/src/src.pri
new file mode 100644
index 000000000..66d903eac
--- /dev/null
+++ b/examples/quickcontrols/controls/touch/src/src.pri
@@ -0,0 +1,2 @@
+SOURCES += \
+    $$PWD/main.cpp
diff --git a/examples/quick/controls/touch/touch.pro b/examples/quickcontrols/controls/touch/touch.pro
index 63902f81b..111c28459 100644
--- a/examples/quick/controls/touch/touch.pro
+++ b/examples/quickcontrols/controls/touch/touch.pro
@@ -17,3 +17,6 @@ OTHER_FILES += \
 
 RESOURCES += \
     resources.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/touch
+INSTALLS += target
diff --git a/examples/quickcontrols/controls/touch/touch.qmlproject b/examples/quickcontrols/controls/touch/touch.qmlproject
new file mode 100644
index 000000000..e5a8bf02c
--- /dev/null
+++ b/examples/quickcontrols/controls/touch/touch.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "main.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
diff --git a/examples/quick/controls/uiforms/MainForm.ui.qml b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml
index 499e7abeb..499e7abeb 100644
--- a/examples/quick/controls/uiforms/MainForm.ui.qml
+++ b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml
diff --git a/examples/quick/controls/uiforms/main.cpp b/examples/quickcontrols/controls/uiforms/main.cpp
index a4709db88..a4709db88 100644
--- a/examples/quick/controls/uiforms/main.cpp
+++ b/examples/quickcontrols/controls/uiforms/main.cpp
diff --git a/examples/quick/controls/uiforms/main.qml b/examples/quickcontrols/controls/uiforms/main.qml
index c0dcc019b..c0dcc019b 100644
--- a/examples/quick/controls/uiforms/main.qml
+++ b/examples/quickcontrols/controls/uiforms/main.qml
diff --git a/examples/quick/controls/uiforms/qml/CustomerModel.qml b/examples/quickcontrols/controls/uiforms/qml/CustomerModel.qml
index ac321b2ce..ac321b2ce 100644
--- a/examples/quick/controls/uiforms/qml/CustomerModel.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/CustomerModel.qml
diff --git a/examples/quick/controls/uiforms/qml/History.qml b/examples/quickcontrols/controls/uiforms/qml/History.qml
index be7a5808b..be7a5808b 100644
--- a/examples/quick/controls/uiforms/qml/History.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/History.qml
diff --git a/examples/quick/controls/uiforms/qml/HistoryForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/HistoryForm.ui.qml
index 94512cfff..94512cfff 100644
--- a/examples/quick/controls/uiforms/qml/HistoryForm.ui.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/HistoryForm.ui.qml
diff --git a/examples/quick/controls/uiforms/qml/Notes.qml b/examples/quickcontrols/controls/uiforms/qml/Notes.qml
index c7f326f7f..c7f326f7f 100644
--- a/examples/quick/controls/uiforms/qml/Notes.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/Notes.qml
diff --git a/examples/quick/controls/uiforms/qml/NotesForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/NotesForm.ui.qml
index e30669875..e30669875 100644
--- a/examples/quick/controls/uiforms/qml/NotesForm.ui.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/NotesForm.ui.qml
diff --git a/examples/quick/controls/uiforms/qml/Settings.qml b/examples/quickcontrols/controls/uiforms/qml/Settings.qml
index eefab2a15..eefab2a15 100644
--- a/examples/quick/controls/uiforms/qml/Settings.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/Settings.qml
diff --git a/examples/quick/controls/uiforms/qml/SettingsForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/SettingsForm.ui.qml
index 00ce1ee1d..00ce1ee1d 100644
--- a/examples/quick/controls/uiforms/qml/SettingsForm.ui.qml
+++ b/examples/quickcontrols/controls/uiforms/qml/SettingsForm.ui.qml
diff --git a/examples/quick/controls/uiforms/uiforms.pro b/examples/quickcontrols/controls/uiforms/uiforms.pro
index 08b3d0c4a..8b8a8a965 100644
--- a/examples/quick/controls/uiforms/uiforms.pro
+++ b/examples/quickcontrols/controls/uiforms/uiforms.pro
@@ -19,3 +19,6 @@ OTHER_FILES += \
     qml/CustomerModel.qml
 
 include(../shared/shared.pri)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/uiforms
+INSTALLS += target
diff --git a/examples/quick/controls/uiforms/uiforms.qrc b/examples/quickcontrols/controls/uiforms/uiforms.qrc
index 447bb039d..447bb039d 100644
--- a/examples/quick/controls/uiforms/uiforms.qrc
+++ b/examples/quickcontrols/controls/uiforms/uiforms.qrc
diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quickcontrols/dialogs/dialogs.pro
index 538e75686..538e75686 100644
--- a/examples/quick/dialogs/dialogs.pro
+++ b/examples/quickcontrols/dialogs/dialogs.pro
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/ColorDialogs.qml
index 60db0d0f9..60db0d0f9 100644
--- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/ColorDialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/CustomDialogs.qml
index c99ed9deb..c99ed9deb 100644
--- a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/CustomDialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/FileDialogs.qml
index ad18cb577..ad18cb577 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/FileDialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/FontDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/FontDialogs.qml
index 91c20de24..91c20de24 100644
--- a/examples/quick/dialogs/systemdialogs/FontDialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/FontDialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/MessageDialogs.qml
index b9b507c72..b9b507c72 100644
--- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/MessageDialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg b/examples/quickcontrols/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
index 4517a3930..4517a3930 100644
--- a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
+++ b/examples/quickcontrols/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
diff --git a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
index 1912a906c..1912a906c 100644
--- a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
+++ b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quickcontrols/dialogs/systemdialogs/main.cpp
index f16109d65..f16109d65 100644
--- a/examples/quick/dialogs/systemdialogs/main.cpp
+++ b/examples/quickcontrols/dialogs/systemdialogs/main.cpp
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.pro
index 128bb1b5c..099e3773f 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro
+++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.pro
@@ -13,7 +13,7 @@ OTHER_FILES += \
     MessageDialogs.qml \
     CustomDialogs.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs/systemdialogs
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/dialogs/systemdialogs
 INSTALLS += target
 
 RESOURCES += systemdialogs.qrc
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qml
index 5971e1c88..5971e1c88 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml
+++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qml
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qrc
index afd81bfee..afd81bfee 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc
+++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qrc
diff --git a/examples/quick/extras/dashboard/dashboard.pro b/examples/quickcontrols/extras/dashboard/dashboard.pro
index c549250ec..eb3ee51be 100644
--- a/examples/quick/extras/dashboard/dashboard.pro
+++ b/examples/quickcontrols/extras/dashboard/dashboard.pro
@@ -16,3 +16,6 @@ OTHER_FILES += \
     qml/TachometerStyle.qml \
     qml/TurnIndicator.qml \
     qml/ValueSource.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/dashboard
+INSTALLS += target
diff --git a/examples/quick/extras/dashboard/dashboard.qrc b/examples/quickcontrols/extras/dashboard/dashboard.qrc
index 605e1678b..605e1678b 100644
--- a/examples/quick/extras/dashboard/dashboard.qrc
+++ b/examples/quickcontrols/extras/dashboard/dashboard.qrc
diff --git a/examples/quick/extras/dashboard/fonts/DejaVuSans.ttf b/examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf
index 19ed0b468..19ed0b468 100644
--- a/examples/quick/extras/dashboard/fonts/DejaVuSans.ttf
+++ b/examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf
diff --git a/examples/quick/extras/dashboard/fonts/LICENSE b/examples/quickcontrols/extras/dashboard/fonts/LICENSE
index 254e2cc42..254e2cc42 100644
--- a/examples/quick/extras/dashboard/fonts/LICENSE
+++ b/examples/quickcontrols/extras/dashboard/fonts/LICENSE
diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quickcontrols/extras/dashboard/images/fuel-icon.png
index 70da758c2..70da758c2 100644
--- a/examples/quick/extras/dashboard/images/fuel-icon.png
+++ b/examples/quickcontrols/extras/dashboard/images/fuel-icon.png
diff --git a/examples/quick/extras/dashboard/images/temperature-icon.png b/examples/quickcontrols/extras/dashboard/images/temperature-icon.png
index 5a4334e01..5a4334e01 100644
--- a/examples/quick/extras/dashboard/images/temperature-icon.png
+++ b/examples/quickcontrols/extras/dashboard/images/temperature-icon.png
diff --git a/examples/quick/extras/dashboard/main.cpp b/examples/quickcontrols/extras/dashboard/main.cpp
index 7a6f46e62..7a6f46e62 100644
--- a/examples/quick/extras/dashboard/main.cpp
+++ b/examples/quickcontrols/extras/dashboard/main.cpp
diff --git a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml
index feb85a5f3..feb85a5f3 100644
--- a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml
diff --git a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml b/examples/quickcontrols/extras/dashboard/qml/IconGaugeStyle.qml
index 392044869..392044869 100644
--- a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/IconGaugeStyle.qml
diff --git a/examples/quick/extras/dashboard/qml/TachometerStyle.qml b/examples/quickcontrols/extras/dashboard/qml/TachometerStyle.qml
index d92da7b5f..d92da7b5f 100644
--- a/examples/quick/extras/dashboard/qml/TachometerStyle.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/TachometerStyle.qml
diff --git a/examples/quick/extras/dashboard/qml/TurnIndicator.qml b/examples/quickcontrols/extras/dashboard/qml/TurnIndicator.qml
index b132510eb..b132510eb 100644
--- a/examples/quick/extras/dashboard/qml/TurnIndicator.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/TurnIndicator.qml
diff --git a/examples/quick/extras/dashboard/qml/ValueSource.qml b/examples/quickcontrols/extras/dashboard/qml/ValueSource.qml
index 7225be482..7225be482 100644
--- a/examples/quick/extras/dashboard/qml/ValueSource.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/ValueSource.qml
diff --git a/examples/quick/extras/dashboard/qml/dashboard.qml b/examples/quickcontrols/extras/dashboard/qml/dashboard.qml
index 6080b516d..6080b516d 100644
--- a/examples/quick/extras/dashboard/qml/dashboard.qml
+++ b/examples/quickcontrols/extras/dashboard/qml/dashboard.qml
diff --git a/examples/quick/extras/extras.pro b/examples/quickcontrols/extras/extras.pro
index 7f7b72156..7f7b72156 100644
--- a/examples/quick/extras/extras.pro
+++ b/examples/quickcontrols/extras/extras.pro
diff --git a/examples/quick/extras/flat/Content.qml b/examples/quickcontrols/extras/flat/Content.qml
index e9b3e869f..e9b3e869f 100644
--- a/examples/quick/extras/flat/Content.qml
+++ b/examples/quickcontrols/extras/flat/Content.qml
diff --git a/examples/quick/extras/flat/SettingsIcon.qml b/examples/quickcontrols/extras/flat/SettingsIcon.qml
index 756426c49..756426c49 100644
--- a/examples/quick/extras/flat/SettingsIcon.qml
+++ b/examples/quickcontrols/extras/flat/SettingsIcon.qml
diff --git a/examples/quick/extras/flat/flat.pro b/examples/quickcontrols/extras/flat/flat.pro
index 387e7ca09..6a6906648 100644
--- a/examples/quick/extras/flat/flat.pro
+++ b/examples/quickcontrols/extras/flat/flat.pro
@@ -14,3 +14,6 @@ OTHER_FILES += \
 DISTFILES += \
     Content.qml \
     SettingsIcon.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/flat
+INSTALLS += target
diff --git a/examples/quick/extras/flat/flat.qrc b/examples/quickcontrols/extras/flat/flat.qrc
index 5b06a55ce..5b06a55ce 100644
--- a/examples/quick/extras/flat/flat.qrc
+++ b/examples/quickcontrols/extras/flat/flat.qrc
diff --git a/examples/quick/extras/flat/images/piemenu-bw-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png
index ef57111fb..ef57111fb 100644
--- a/examples/quick/extras/flat/images/piemenu-bw-normal.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png
diff --git a/examples/quick/extras/flat/images/piemenu-bw-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png
index b6bd1d20d..b6bd1d20d 100644
--- a/examples/quick/extras/flat/images/piemenu-bw-pressed.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png
diff --git a/examples/quick/extras/flat/images/piemenu-image-bw.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg
index ce4d8ffda..ce4d8ffda 100644
--- a/examples/quick/extras/flat/images/piemenu-image-bw.jpg
+++ b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg
diff --git a/examples/quick/extras/flat/images/piemenu-image-rgb.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg
index 2d7d22056..2d7d22056 100644
--- a/examples/quick/extras/flat/images/piemenu-image-rgb.jpg
+++ b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg
diff --git a/examples/quick/extras/flat/images/piemenu-image-sepia.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg
index 3ef7b1f0f..3ef7b1f0f 100644
--- a/examples/quick/extras/flat/images/piemenu-image-sepia.jpg
+++ b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg
diff --git a/examples/quick/extras/flat/images/piemenu-rgb-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png
index 2278f4a9e..2278f4a9e 100644
--- a/examples/quick/extras/flat/images/piemenu-rgb-normal.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png
diff --git a/examples/quick/extras/flat/images/piemenu-rgb-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png
index f45846b17..f45846b17 100644
--- a/examples/quick/extras/flat/images/piemenu-rgb-pressed.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png
diff --git a/examples/quick/extras/flat/images/piemenu-sepia-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png
index f1e9ffd26..f1e9ffd26 100644
--- a/examples/quick/extras/flat/images/piemenu-sepia-normal.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png
diff --git a/examples/quick/extras/flat/images/piemenu-sepia-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png
index 0f2b35171..0f2b35171 100644
--- a/examples/quick/extras/flat/images/piemenu-sepia-pressed.png
+++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png
diff --git a/examples/quick/extras/flat/main.cpp b/examples/quickcontrols/extras/flat/main.cpp
index dd90f807d..61b1e9b3e 100644
--- a/examples/quick/extras/flat/main.cpp
+++ b/examples/quickcontrols/extras/flat/main.cpp
@@ -57,7 +57,12 @@ int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
     if (qgetenv("QT_QUICK_CONTROLS_1_STYLE").isEmpty()) {
+#ifdef QT_STATIC
+        // Need a full path to find the style when built statically
+        qputenv("QT_QUICK_CONTROLS_1_STYLE", ":/ExtrasImports/QtQuick/Controls/Styles/Flat");
+#else
         qputenv("QT_QUICK_CONTROLS_1_STYLE", "Flat");
+#endif
     }
     QQmlApplicationEngine engine;
     engine.load(QUrl("qrc:/main.qml"));
diff --git a/examples/quick/extras/flat/main.qml b/examples/quickcontrols/extras/flat/main.qml
index d91c20633..d91c20633 100644
--- a/examples/quick/extras/flat/main.qml
+++ b/examples/quickcontrols/extras/flat/main.qml
diff --git a/examples/quick/extras/gallery/fonts/LICENSE.txt b/examples/quickcontrols/extras/gallery/fonts/LICENSE.txt
index d64569567..d64569567 100644
--- a/examples/quick/extras/gallery/fonts/LICENSE.txt
+++ b/examples/quickcontrols/extras/gallery/fonts/LICENSE.txt
diff --git a/examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf b/examples/quickcontrols/extras/gallery/fonts/OpenSans-Regular.ttf
index db433349b..db433349b 100644
--- a/examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf
+++ b/examples/quickcontrols/extras/gallery/fonts/OpenSans-Regular.ttf
diff --git a/examples/quick/extras/gallery/gallery.pro b/examples/quickcontrols/extras/gallery/gallery.pro
index 3c50a7c23..548df63f4 100644
--- a/examples/quick/extras/gallery/gallery.pro
+++ b/examples/quickcontrols/extras/gallery/gallery.pro
@@ -9,6 +9,9 @@ SOURCES += \
 RESOURCES += \
     gallery.qrc
 
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/gallery
+INSTALLS += target
+
 OTHER_FILES += \
     qml/BlackButtonBackground.qml \
     qml/BlackButtonStyle.qml \
diff --git a/examples/quick/extras/gallery/gallery.qrc b/examples/quickcontrols/extras/gallery/gallery.qrc
index 97beb6b1b..97beb6b1b 100644
--- a/examples/quick/extras/gallery/gallery.qrc
+++ b/examples/quickcontrols/extras/gallery/gallery.qrc
diff --git a/examples/quick/extras/gallery/images/background-light.png b/examples/quickcontrols/extras/gallery/images/background-light.png
index 2f7698452..2f7698452 100644
--- a/examples/quick/extras/gallery/images/background-light.png
+++ b/examples/quickcontrols/extras/gallery/images/background-light.png
diff --git a/examples/quick/extras/gallery/images/background.png b/examples/quickcontrols/extras/gallery/images/background.png
index a3f4302bc..a3f4302bc 100644
--- a/examples/quick/extras/gallery/images/background.png
+++ b/examples/quickcontrols/extras/gallery/images/background.png
diff --git a/examples/quick/extras/gallery/images/center-light.png b/examples/quickcontrols/extras/gallery/images/center-light.png
index 75add20ce..75add20ce 100644
--- a/examples/quick/extras/gallery/images/center-light.png
+++ b/examples/quickcontrols/extras/gallery/images/center-light.png
diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quickcontrols/extras/gallery/images/center.png
index fd3696404..fd3696404 100644
--- a/examples/quick/extras/gallery/images/center.png
+++ b/examples/quickcontrols/extras/gallery/images/center.png
diff --git a/examples/quick/extras/gallery/images/icon-back.png b/examples/quickcontrols/extras/gallery/images/icon-back.png
index 0b037ff69..0b037ff69 100644
--- a/examples/quick/extras/gallery/images/icon-back.png
+++ b/examples/quickcontrols/extras/gallery/images/icon-back.png
diff --git a/examples/quick/extras/gallery/images/icon-go.png b/examples/quickcontrols/extras/gallery/images/icon-go.png
index bcb2a822a..bcb2a822a 100644
--- a/examples/quick/extras/gallery/images/icon-go.png
+++ b/examples/quickcontrols/extras/gallery/images/icon-go.png
diff --git a/examples/quick/extras/gallery/images/icon-settings.png b/examples/quickcontrols/extras/gallery/images/icon-settings.png
index 7763ba20e..7763ba20e 100644
--- a/examples/quick/extras/gallery/images/icon-settings.png
+++ b/examples/quickcontrols/extras/gallery/images/icon-settings.png
diff --git a/examples/quick/extras/gallery/images/info.png b/examples/quickcontrols/extras/gallery/images/info.png
index 5c7a9df3c..5c7a9df3c 100644
--- a/examples/quick/extras/gallery/images/info.png
+++ b/examples/quickcontrols/extras/gallery/images/info.png
diff --git a/examples/quick/extras/gallery/images/needle-light.png b/examples/quickcontrols/extras/gallery/images/needle-light.png
index d486d9e53..d486d9e53 100644
--- a/examples/quick/extras/gallery/images/needle-light.png
+++ b/examples/quickcontrols/extras/gallery/images/needle-light.png
diff --git a/examples/quick/extras/gallery/images/needle.png b/examples/quickcontrols/extras/gallery/images/needle.png
index 6b10c604a..6b10c604a 100644
--- a/examples/quick/extras/gallery/images/needle.png
+++ b/examples/quickcontrols/extras/gallery/images/needle.png
diff --git a/examples/quick/extras/gallery/images/qt-logo.png b/examples/quickcontrols/extras/gallery/images/qt-logo.png
index 14ddf2a02..14ddf2a02 100644
--- a/examples/quick/extras/gallery/images/qt-logo.png
+++ b/examples/quickcontrols/extras/gallery/images/qt-logo.png
diff --git a/examples/quick/extras/gallery/images/zoom_in.png b/examples/quickcontrols/extras/gallery/images/zoom_in.png
index 412821064..412821064 100644
--- a/examples/quick/extras/gallery/images/zoom_in.png
+++ b/examples/quickcontrols/extras/gallery/images/zoom_in.png
diff --git a/examples/quick/extras/gallery/images/zoom_out.png b/examples/quickcontrols/extras/gallery/images/zoom_out.png
index 772d6ac17..772d6ac17 100644
--- a/examples/quick/extras/gallery/images/zoom_out.png
+++ b/examples/quickcontrols/extras/gallery/images/zoom_out.png
diff --git a/examples/quick/extras/gallery/main.cpp b/examples/quickcontrols/extras/gallery/main.cpp
index 01e510e8d..01e510e8d 100644
--- a/examples/quick/extras/gallery/main.cpp
+++ b/examples/quickcontrols/extras/gallery/main.cpp
diff --git a/examples/quick/extras/gallery/qml/BlackButtonBackground.qml b/examples/quickcontrols/extras/gallery/qml/BlackButtonBackground.qml
index 10f3d7045..10f3d7045 100644
--- a/examples/quick/extras/gallery/qml/BlackButtonBackground.qml
+++ b/examples/quickcontrols/extras/gallery/qml/BlackButtonBackground.qml
diff --git a/examples/quick/extras/gallery/qml/BlackButtonStyle.qml b/examples/quickcontrols/extras/gallery/qml/BlackButtonStyle.qml
index c151d6d64..c151d6d64 100644
--- a/examples/quick/extras/gallery/qml/BlackButtonStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/BlackButtonStyle.qml
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDarkStyle.qml
index a38eba1fd..a38eba1fd 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDarkStyle.qml
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDefaultStyle.qml
index 82e568ea9..82e568ea9 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDefaultStyle.qml
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeLightStyle.qml
index 03f63c4a1..03f63c4a1 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeLightStyle.qml
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeView.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeView.qml
index bfb7a0c75..bfb7a0c75 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeView.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeView.qml
diff --git a/examples/quick/extras/gallery/qml/ControlLabel.qml b/examples/quickcontrols/extras/gallery/qml/ControlLabel.qml
index a176eaa6a..a176eaa6a 100644
--- a/examples/quick/extras/gallery/qml/ControlLabel.qml
+++ b/examples/quickcontrols/extras/gallery/qml/ControlLabel.qml
diff --git a/examples/quick/extras/gallery/qml/ControlView.qml b/examples/quickcontrols/extras/gallery/qml/ControlView.qml
index 2f99ea77d..2f99ea77d 100644
--- a/examples/quick/extras/gallery/qml/ControlView.qml
+++ b/examples/quickcontrols/extras/gallery/qml/ControlView.qml
diff --git a/examples/quick/extras/gallery/qml/ControlViewToolbar.qml b/examples/quickcontrols/extras/gallery/qml/ControlViewToolbar.qml
index f7a991fcc..f7a991fcc 100644
--- a/examples/quick/extras/gallery/qml/ControlViewToolbar.qml
+++ b/examples/quickcontrols/extras/gallery/qml/ControlViewToolbar.qml
diff --git a/examples/quick/extras/gallery/qml/CustomizerLabel.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerLabel.qml
index 3216bd63b..3216bd63b 100644
--- a/examples/quick/extras/gallery/qml/CustomizerLabel.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CustomizerLabel.qml
diff --git a/examples/quick/extras/gallery/qml/CustomizerSlider.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerSlider.qml
index d4972ad1c..d4972ad1c 100644
--- a/examples/quick/extras/gallery/qml/CustomizerSlider.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CustomizerSlider.qml
diff --git a/examples/quick/extras/gallery/qml/CustomizerSwitch.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerSwitch.qml
index c8feace1f..c8feace1f 100644
--- a/examples/quick/extras/gallery/qml/CustomizerSwitch.qml
+++ b/examples/quickcontrols/extras/gallery/qml/CustomizerSwitch.qml
diff --git a/examples/quick/extras/gallery/qml/FlickableMoreIndicator.qml b/examples/quickcontrols/extras/gallery/qml/FlickableMoreIndicator.qml
index 674f3b586..674f3b586 100644
--- a/examples/quick/extras/gallery/qml/FlickableMoreIndicator.qml
+++ b/examples/quickcontrols/extras/gallery/qml/FlickableMoreIndicator.qml
diff --git a/examples/quick/extras/gallery/qml/PieMenuControlView.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuControlView.qml
index 1c4030da3..1c4030da3 100644
--- a/examples/quick/extras/gallery/qml/PieMenuControlView.qml
+++ b/examples/quickcontrols/extras/gallery/qml/PieMenuControlView.qml
diff --git a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuDarkStyle.qml
index fc5134630..fc5134630 100644
--- a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/PieMenuDarkStyle.qml
diff --git a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuDefaultStyle.qml
index c6bf8f715..c6bf8f715 100644
--- a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml
+++ b/examples/quickcontrols/extras/gallery/qml/PieMenuDefaultStyle.qml
diff --git a/examples/quick/extras/gallery/qml/StylePicker.qml b/examples/quickcontrols/extras/gallery/qml/StylePicker.qml
index 5a84d3620..5a84d3620 100644
--- a/examples/quick/extras/gallery/qml/StylePicker.qml
+++ b/examples/quickcontrols/extras/gallery/qml/StylePicker.qml
diff --git a/examples/quick/extras/gallery/qml/gallery.qml b/examples/quickcontrols/extras/gallery/qml/gallery.qml
index ae6c162d1..ae6c162d1 100644
--- a/examples/quick/extras/gallery/qml/gallery.qml
+++ b/examples/quickcontrols/extras/gallery/qml/gallery.qml
diff --git a/examples/quickcontrols/quickcontrols.pro b/examples/quickcontrols/quickcontrols.pro
new file mode 100644
index 000000000..dfe855099
--- /dev/null
+++ b/examples/quickcontrols/quickcontrols.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+    controls \
+    dialogs \
+    extras