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 /tests/auto/snippets | |
| 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 'tests/auto/snippets')
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/snippets/data/dial/qtquickextras2-dial-background.qml b/tests/auto/snippets/data/dial/qtquickextras2-dial-background.qml index bdd95411..b9a48498 100644 --- a/tests/auto/snippets/data/dial/qtquickextras2-dial-background.qml +++ b/tests/auto/snippets/data/dial/qtquickextras2-dial-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Dial { Rectangle { diff --git a/tests/auto/snippets/data/dial/qtquickextras2-dial-handle.qml b/tests/auto/snippets/data/dial/qtquickextras2-dial-handle.qml index f7ab5d4d..9851478e 100644 --- a/tests/auto/snippets/data/dial/qtquickextras2-dial-handle.qml +++ b/tests/auto/snippets/data/dial/qtquickextras2-dial-handle.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Dial { id: dial diff --git a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-background.qml b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-background.qml index 93fc9e5e..5a9832c4 100644 --- a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-background.qml +++ b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Tumbler { model: 5 diff --git a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-contentItem.qml b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-contentItem.qml index 0bb25dff..51a0a7bb 100644 --- a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-contentItem.qml +++ b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-contentItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Tumbler { model: 5 diff --git a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-delegate.qml b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-delegate.qml index 2b775c11..d7f02c0c 100644 --- a/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-delegate.qml +++ b/tests/auto/snippets/data/tumbler/qtquickextras2-tumbler-delegate.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 Tumbler { id: tumbler |