diff options
Diffstat (limited to 'tests/auto')
14 files changed, 10 insertions, 63 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c8076194..4c42920b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,6 +4,5 @@ SUBDIRS += \ activeFocusOnTab \ applicationwindow \ controls \ - extras \ sanity \ snippets diff --git a/tests/auto/extras/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 673ed142..18d7fb97 100644 --- a/tests/auto/extras/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -40,7 +40,6 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Extras 2.0 Row { id: datePicker diff --git a/tests/auto/extras/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index 0d1a1124..5a4a66a5 100644 --- a/tests/auto/extras/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 TestCase { id: testCase diff --git a/tests/auto/extras/data/tst_drawer.qml b/tests/auto/controls/data/tst_drawer.qml index 33919c13..af815bed 100644 --- a/tests/auto/extras/data/tst_drawer.qml +++ b/tests/auto/controls/data/tst_drawer.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 TestCase { id: testCase diff --git a/tests/auto/extras/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index 81c61f45..a4dd41dd 100644 --- a/tests/auto/extras/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 TestCase { id: testCase diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 928d53fa..c916b0f6 100644 --- a/tests/auto/extras/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Extras 2.0 +import QtQuick.Controls 2.0 TestCase { id: testCase @@ -57,7 +57,7 @@ TestCase { readonly property real defaultListViewTumblerOffset: -defaultImplicitDelegateHeight function init() { - tumbler = Qt.createQmlObject("import QtQuick.Extras 2.0; Tumbler { }", testCase, ""); + tumbler = Qt.createQmlObject("import QtQuick.Controls 2.0; Tumbler { }", testCase, ""); verify(tumbler, "Tumbler: failed to create an instance"); compare(tumbler.contentItem.parent, tumbler); } diff --git a/tests/auto/extras/extras.pro b/tests/auto/extras/extras.pro deleted file mode 100644 index 434e4196..00000000 --- a/tests/auto/extras/extras.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = tst_extras -CONFIG += qmltestcase - -SOURCES += \ - $$PWD/tst_extras.cpp - -TESTDATA += \ - $$PWD/data/* - -OTHER_FILES += \ - $$PWD/data/* diff --git a/tests/auto/extras/tst_extras.cpp b/tests/auto/extras/tst_extras.cpp deleted file mode 100644 index 057176d1..00000000 --- a/tests/auto/extras/tst_extras.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtQuickTest/quicktest.h> -QUICK_TEST_MAIN(tst_extras) diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index a32502f0..1b9eebdd 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -149,7 +149,6 @@ void tst_Sanity::initTestCase() foreach (const QString &path, engine.importPathList()) { files.unite(listQmlFiles(QDir(path + "/QtQuick/Calendar.2"))); files.unite(listQmlFiles(QDir(path + "/QtQuick/Controls.2"))); - files.unite(listQmlFiles(QDir(path + "/QtQuick/Extras.2"))); } } 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 |