diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 13:40:01 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 14:14:07 +0000 |
| commit | 0797e0cb2072a0b5cac4d8db2205d932cc64d25c (patch) | |
| tree | 103fd7a6f67a83bd7b6f44dcc9c2a67547aa2cb2 /examples | |
| parent | 2ef6a789e9cd91a9245c65201a6fe3d3322712ad (diff) | |
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/calendar/DateTimePicker.qml | 1 | ||||
| -rw-r--r-- | examples/quick/calendar/TumblerDelegate.qml | 2 | ||||
| -rw-r--r-- | examples/quick/controls/controls.pro | 3 | ||||
| -rw-r--r-- | examples/quick/controls/drawer/drawer.pro (renamed from examples/quick/extras/drawer/drawer.pro) | 0 | ||||
| -rw-r--r-- | examples/quick/controls/drawer/drawer.qrc (renamed from examples/quick/extras/drawer/drawer.qrc) | 0 | ||||
| -rw-r--r-- | examples/quick/controls/drawer/images/arrow.png (renamed from examples/quick/extras/drawer/images/arrow.png) | bin | 2446 -> 2446 bytes | |||
| -rw-r--r-- | examples/quick/controls/drawer/images/qt-logo.png (renamed from examples/quick/extras/drawer/images/qt-logo.png) | bin | 21710 -> 21710 bytes | |||
| -rw-r--r-- | examples/quick/controls/drawer/main.cpp (renamed from examples/quick/extras/drawer/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/quick/controls/drawer/main.qml (renamed from examples/quick/extras/drawer/main.qml) | 1 | ||||
| -rw-r--r-- | examples/quick/controls/tabs/main.qml | 1 | ||||
| -rw-r--r-- | examples/quick/extras/extras.pro | 3 | ||||
| -rw-r--r-- | examples/quick/quick.pro | 3 |
12 files changed, 4 insertions, 10 deletions
diff --git a/examples/quick/calendar/DateTimePicker.qml b/examples/quick/calendar/DateTimePicker.qml index 88238048..a3c5df7f 100644 --- a/examples/quick/calendar/DateTimePicker.qml +++ b/examples/quick/calendar/DateTimePicker.qml @@ -41,7 +41,6 @@ import QtQuick 2.6 import QtQuick.Calendar 2.0 import QtQuick.Controls 2.0 -import QtQuick.Extras 2.0 Item { id: dateTimePicker diff --git a/examples/quick/calendar/TumblerDelegate.qml b/examples/quick/calendar/TumblerDelegate.qml index 60d71f21..dcfb83e4 100644 --- a/examples/quick/calendar/TumblerDelegate.qml +++ b/examples/quick/calendar/TumblerDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Text { text: isNaN(modelData) ? modelData : modelData + 1 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/extras/drawer/drawer.pro b/examples/quick/controls/drawer/drawer.pro index 8c128054..8c128054 100644 --- a/examples/quick/extras/drawer/drawer.pro +++ b/examples/quick/controls/drawer/drawer.pro diff --git a/examples/quick/extras/drawer/drawer.qrc b/examples/quick/controls/drawer/drawer.qrc index 25cc5cbe..25cc5cbe 100644 --- a/examples/quick/extras/drawer/drawer.qrc +++ b/examples/quick/controls/drawer/drawer.qrc diff --git a/examples/quick/extras/drawer/images/arrow.png b/examples/quick/controls/drawer/images/arrow.png Binary files differindex 4981e0de..4981e0de 100644 --- a/examples/quick/extras/drawer/images/arrow.png +++ b/examples/quick/controls/drawer/images/arrow.png diff --git a/examples/quick/extras/drawer/images/qt-logo.png b/examples/quick/controls/drawer/images/qt-logo.png Binary files differindex cf350dad..cf350dad 100644 --- a/examples/quick/extras/drawer/images/qt-logo.png +++ b/examples/quick/controls/drawer/images/qt-logo.png diff --git a/examples/quick/extras/drawer/main.cpp b/examples/quick/controls/drawer/main.cpp index 2abdc16d..2abdc16d 100644 --- a/examples/quick/extras/drawer/main.cpp +++ b/examples/quick/controls/drawer/main.cpp diff --git a/examples/quick/extras/drawer/main.qml b/examples/quick/controls/drawer/main.qml index e45a69d0..45819e6f 100644 --- a/examples/quick/extras/drawer/main.qml +++ b/examples/quick/controls/drawer/main.qml @@ -40,7 +40,6 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Extras 2.0 ApplicationWindow { id: window 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 diff --git a/examples/quick/extras/extras.pro b/examples/quick/extras/extras.pro deleted file mode 100644 index 960d3705..00000000 --- a/examples/quick/extras/extras.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - drawer diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 18a33efe..80f94e86 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ calendar \ - controls \ - extras + controls |
