1 files changed, 0 insertions, 122 deletions
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp b/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
deleted file mode 100644
index e0fd8fef..00000000
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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 <qtest.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickControls2/private/qquickstyle_p.h>
-#include "../shared/util.h"
-#include "../shared/visualtestutil.h"
-
-using namespace QQuickVisualTestUtil;
-
-class tst_qquickmaterialstyleconf : public QQmlDataTest
-{
-    Q_OBJECT
-
-public:
-
-private slots:
-    void conf();
-    void variants_data();
-    void variants();
-};
-
-void tst_qquickmaterialstyleconf::conf()
-{
-    QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QFont customFont;
-    customFont.setFamilies(QStringList{QLatin1String("Courier")});
-    customFont.setPixelSize(22);
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-    // We specified a custom background color and font, so the window should have them.
-    QCOMPARE(window->property("color").value<QColor>(), QColor("#444444"));
-    QCOMPARE(window->property("font").value<QFont>(), customFont);
-
-    // We specified a custom foreground color and font, so the label should have them.
-    QQuickItem *label = window->property("label").value<QQuickItem*>();
-    QVERIFY(label);
-    QCOMPARE(label->property("color").value<QColor>(), QColor("#F44336"));
-    QCOMPARE(label->property("font").value<QFont>(), customFont);
-}
-
-void tst_qquickmaterialstyleconf::variants_data()
-{
-    QTest::addColumn<QByteArray>("confPath");
-    QTest::addColumn<int>("expectedButtonHeight");
-    // Just to ensure that the correct conf is loaded.
-    QTest::addColumn<QColor>("expectedColor");
-
-    // (36 button height + 12 touchable area)
-    QTest::newRow("normal") << QByteArray(":/variant-normal.conf") << 48 << QColor::fromRgb(0x123456);
-    // We specified a custom variant (dense), so the button should be small.
-    // (32 button height + 12 touchable area)
-    QTest::newRow("dense") << QByteArray(":/variant-dense.conf") << 44 << QColor::fromRgb(0x789abc);
-}
-
-void tst_qquickmaterialstyleconf::variants()
-{
-    QFETCH(QByteArray, confPath);
-    QFETCH(int, expectedButtonHeight);
-    QFETCH(QColor, expectedColor);
-
-    qmlClearTypeRegistrations();
-    QQuickStylePrivate::reset();
-    qputenv("QT_QUICK_CONTROLS_CONF", confPath);
-
-    QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickItem *label = window->property("label").value<QQuickItem*>();
-    QVERIFY(label);
-    QCOMPARE(label->property("color").value<QColor>(), expectedColor);
-
-    QQuickItem *button = window->property("button").value<QQuickItem*>();
-    QVERIFY(button);
-    QCOMPARE(button->height(), expectedButtonHeight);
-}
-
-QTEST_MAIN(tst_qquickmaterialstyleconf)
-
-#include "tst_qquickmaterialstyleconf.moc"