Merge Qt Quick Extras into Qt Quick Controls

The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.

Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

8 files changed, 233 insertions, 2 deletions

diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
index f3b2e617..950309a6 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quick/controls/controls.pro
@@ -2,4 +2,5 @@ TEMPLATE = subdirs
 SUBDIRS += \
     mirroring \
     theme \
-    tabs
+    tabs \
+    drawer
diff --git a/examples/quick/controls/drawer/drawer.pro b/examples/quick/controls/drawer/drawer.pro
new file mode 100644
index 00000000..8c128054
--- /dev/null
+++ b/examples/quick/controls/drawer/drawer.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET = drawer
+QT += quick
+
+SOURCES += \
+    main.cpp
+
+OTHER_FILES += \
+    main.qml
+
+RESOURCES += \
+    drawer.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/drawer
+INSTALLS += target
diff --git a/examples/quick/controls/drawer/drawer.qrc b/examples/quick/controls/drawer/drawer.qrc
new file mode 100644
index 00000000..25cc5cbe
--- /dev/null
+++ b/examples/quick/controls/drawer/drawer.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+        <file>images/arrow.png</file>
+        <file>images/qt-logo.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/controls/drawer/images/arrow.png b/examples/quick/controls/drawer/images/arrow.png
new file mode 100644
index 00000000..4981e0de
--- /dev/null
+++ b/examples/quick/controls/drawer/images/arrow.png
diff --git a/examples/quick/controls/drawer/images/qt-logo.png b/examples/quick/controls/drawer/images/qt-logo.png
new file mode 100644
index 00000000..cf350dad
--- /dev/null
+++ b/examples/quick/controls/drawer/images/qt-logo.png
diff --git a/examples/quick/controls/drawer/main.cpp b/examples/quick/controls/drawer/main.cpp
new file mode 100644
index 00000000..2abdc16d
--- /dev/null
+++ b/examples/quick/controls/drawer/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** 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 <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+    QQmlApplicationEngine engine;
+    engine.load(QUrl("qrc:/main.qml"));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+    return app.exec();
+}
diff --git a/examples/quick/controls/drawer/main.qml b/examples/quick/controls/drawer/main.qml
new file mode 100644
index 00000000..45819e6f
--- /dev/null
+++ b/examples/quick/controls/drawer/main.qml
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** 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.6
+import QtQuick.Controls 2.0
+
+ApplicationWindow {
+    id: window
+    width: 360
+    height: 520
+    visible: true
+    title: "Qt Quick Controls - Drawer Example"
+
+    Rectangle {
+        id: content
+        anchors.fill: parent
+        anchors.margins: -1
+        border.color: Theme.frameColor
+
+        Image {
+            width: window.width / 2
+            height: window.height / 2
+            anchors.centerIn: parent
+            anchors.horizontalCenterOffset: window.width > window.height ? width / 2 : 0
+            anchors.verticalCenterOffset: window.width < window.height ? -height / 4 : 0
+            fillMode: Image.PreserveAspectFit
+            source: "qrc:/images/qt-logo.png"
+        }
+
+        Image {
+            width: window.width / 2
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: height / 2
+            fillMode: Image.PreserveAspectFit
+            source: "qrc:/images/arrow.png"
+        }
+
+        transform: Translate {
+            x: effect.current === uncover ? drawer.position * listview.width :
+               effect.current === push ? drawer.position * listview.width * 0.5 : 0
+        }
+
+        z: effect.current === uncover ? 2 : 0
+    }
+
+    Drawer {
+        id: drawer
+        anchors.fill: parent
+
+        ListView {
+            id: listview
+
+            width: window.width / 3 * 2
+            height: window.height
+
+            ExclusiveGroup {
+                id: effect
+            }
+
+            model: VisualItemModel {
+                Label {
+                    text: "Settings"
+                    x: 6
+                    width: parent.width - 12
+                    lineHeight: 2.0
+                    color: Theme.accentColor
+                    verticalAlignment: Text.AlignVCenter
+                }
+                Rectangle { width: parent.width; height: 1; color: Theme.frameColor }
+                Switch {
+                    id: dim
+                    text: "Dim"
+                    checked: true
+                    width: parent.width
+                    layoutDirection: Qt.RightToLeft
+                    enabled: effect.current != uncover
+                }
+                Rectangle { width: parent.width; height: 1; color: Theme.frameColor }
+                RadioButton {
+                    id: overlay
+                    text: "Overlay"
+                    checked: true
+                    width: parent.width
+                    ExclusiveGroup.group: effect
+                    layoutDirection: Qt.RightToLeft
+                }
+                RadioButton {
+                    id: push
+                    text: "Push"
+                    width: parent.width
+                    ExclusiveGroup.group: effect
+                    layoutDirection: Qt.RightToLeft
+                }
+                RadioButton {
+                    id: uncover
+                    text: "Uncover"
+                    width: parent.width
+                    ExclusiveGroup.group: effect
+                    layoutDirection: Qt.RightToLeft
+                }
+                Rectangle { width: parent.width; height: 1; color: Theme.frameColor }
+            }
+            Rectangle {
+                z: -1
+                anchors.fill: parent
+                anchors.topMargin: -1
+                anchors.bottomMargin: -1
+                border.color: Theme.frameColor
+            }
+
+            transform: Translate {
+                x: effect.current === uncover ? (1.0 - drawer.position) * listview.width : 0
+            }
+        }
+
+        background.visible: dim.checked
+
+        onClicked: close()
+    }
+}
diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml
index b5ec03f1..42800236 100644
--- a/examples/quick/controls/tabs/main.qml
+++ b/examples/quick/controls/tabs/main.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Extras 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0
 import QtQuick.Templates 2.0 as T