Stop using resolvedUrl() to resolve QML files

This is necessary to move away from imperative type registration of QML
files (i.e. qmlRegisterType()).

A later patch will use qmlRegisterModuleImport() to register the
QtQuick.Controls import with the style set by the user, which will
require each style to have a qmldir listing the files that it provides.

Note that some plugins still register QML files, but these registrations
will have to stay for now until we can split out "impl" plugins
in later patches where those files can be registered.

tst_qquickstyleselector will be added back in some other form in a
follow-up patch.

Task-number: QTBUG-82922
Change-Id: I8182533d9912ed493efda6eb91c69fc064af07ee
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

15 files changed, 0 insertions, 270 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 03b6369d..e41723ea 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -24,7 +24,6 @@ SUBDIRS += \
     qquickninepatchimage \
     qquickpopup \
     qquickstyle \
-    qquickstyleselector \
     qquickuniversalstyle \
     qquickuniversalstyleconf \
     revisions \
diff --git a/tests/auto/qquickstyleselector/CMakeLists.txt b/tests/auto/qquickstyleselector/CMakeLists.txt
deleted file mode 100644
index 3a489ccf..00000000
--- a/tests/auto/qquickstyleselector/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated from qquickstyleselector.pro.
-
-#####################################################################
-## tst_qquickstyleselector Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_add_test(tst_qquickstyleselector
-    SOURCES
-        ../shared/qtest_quickcontrols.h
-        ../shared/util.cpp ../shared/util.h
-        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
-        tst_qquickstyleselector.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_resourcestyle_resource_files
-    "ResourceStyle/Button.qml"
-)
-
-qt_add_resource(tst_qquickstyleselector "qmake_resourcestyle"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_resourcestyle_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickstyleselector.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/Button.qml b/tests/auto/qquickstyleselector/data/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/Control.qml b/tests/auto/qquickstyleselector/data/Control.qml
deleted file mode 100644
index 6820b57d..00000000
--- a/tests/auto/qquickstyleselector/data/Control.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Control { }
diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml
deleted file mode 100644
index 23699c1c..00000000
--- a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Label { }
diff --git a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/Label.qml b/tests/auto/qquickstyleselector/data/Label.qml
deleted file mode 100644
index 23699c1c..00000000
--- a/tests/auto/qquickstyleselector/data/Label.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Label { }
diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml
deleted file mode 100644
index eaeeadcd..00000000
--- a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import QtQuick.Templates 2.12 as T
-T.Button { }
diff --git a/tests/auto/qquickstyleselector/qquickstyleselector.pro b/tests/auto/qquickstyleselector/qquickstyleselector.pro
deleted file mode 100644
index 6569b46d..00000000
--- a/tests/auto/qquickstyleselector/qquickstyleselector.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qquickstyleselector
-SOURCES += tst_qquickstyleselector.cpp
-
-macos:CONFIG -= app_bundle
-
-QT += core-private gui-private qml-private quick-private quickcontrols2-private testlib
-
-include (../shared/util.pri)
-
-resourcestyle.prefix = /
-resourcestyle.files += $$PWD/ResourceStyle/Button.qml
-RESOURCES += resourcestyle
-
-TESTDATA = data/*
-
-OTHER_FILES += \
-    data/*.qml
-
diff --git a/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp b/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp
deleted file mode 100644
index ce2e2e99..00000000
--- a/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp
+++ /dev/null
@@ -1,167 +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 <QtTest/qtest.h>
-#include <QtQuickControls2/qquickstyle.h>
-#include <QtQuickControls2/private/qquickstyle_p.h>
-#include <QtQuickControls2/private/qquickstyleselector_p.h>
-#include "../shared/util.h"
-
-class tst_QQuickStyleSelector : public QQmlDataTest
-{
-    Q_OBJECT
-
-private slots:
-    void initTestCase();
-
-    void select_data();
-    void select();
-
-    void platformSelectors();
-};
-
-void tst_QQuickStyleSelector::initTestCase()
-{
-    QQmlDataTest::initTestCase();
-    QQuickStylePrivate::init(dataDirectoryUrl());
-}
-
-void tst_QQuickStyleSelector::select_data()
-{
-    QTest::addColumn<QString>("file");
-    QTest::addColumn<QString>("style");
-    QTest::addColumn<QString>("path");
-    QTest::addColumn<QString>("fallback");
-    QTest::addColumn<QString>("expected");
-
-    // Control.qml exists only in the default style
-    QTest::newRow("control") << "Control.qml" << "" << "data" << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/control") << "Control.qml" << "" << dataDirectory() << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("fs/control") << "Control.qml" << "FileSystemStyle" << "data" << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/fs/control") << "Control.qml" << "FileSystemStyle" << dataDirectory() << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow(":/control") << "Control.qml" << "ResourceStyle" << ":/" << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("qrc:/control") << "Control.qml" << "ResourceStyle" << "qrc:/" << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("nosuch/control") << "Control.qml" << "NoSuchStyle" << "data" << "" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/nosuch/control") << "Control.qml" << "NoSuchStyle" << dataDirectory() << "" << testFileUrl("Control.qml").toString();
-
-    QTest::newRow("control->base") << "Control.qml" << "" << "data" << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/control->base") << "Control.qml" << "" << dataDirectory() << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("fs/control->base") << "Control.qml" << "FileSystemStyle" << "data" << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/fs/control->base") << "Control.qml" << "FileSystemStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow(":/control->base") << "Control.qml" << "ResourceStyle" << ":/" << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("qrc:/control->base") << "Control.qml" << "ResourceStyle" << "qrc:/" << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("nosuch/control->base") << "Control.qml" << "NoSuchStyle" << "data" << "FallbackStyle" << testFileUrl("Control.qml").toString();
-    QTest::newRow("/nosuch/control->base") << "Control.qml" << "NoSuchStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("Control.qml").toString();
-
-    // Label.qml exists in the default and fallback styles
-    QTest::newRow("label") << "Label.qml" << "" << "data" << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("/label") << "Label.qml" << "" << dataDirectory() << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("fs/label") << "Label.qml" << "FileSystemStyle" << "data" << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("/fs/label") << "Label.qml" << "FileSystemStyle" << dataDirectory() << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow(":/label") << "Label.qml" << "ResourceStyle" << ":/" << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("qrc:/label") << "Label.qml" << "ResourceStyle" << "qrc:/" << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("nosuch/label") << "Label.qml" << "NoSuchStyle" << "data" << "" << testFileUrl("Label.qml").toString();
-    QTest::newRow("/nosuch/label") << "Label.qml" << "NoSuchStyle" << dataDirectory() << "" << testFileUrl("Label.qml").toString();
-
-    QTest::newRow("label->base") << "Label.qml" << "" << "data" << "FallbackStyle" << testFileUrl("Label.qml").toString();
-    QTest::newRow("/label->base") << "Label.qml" << "" << dataDirectory() << "FallbackStyle" << testFileUrl("Label.qml").toString();
-    QTest::newRow("fs/label->base") << "Label.qml" << "FileSystemStyle" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-    QTest::newRow("/fs/label->base") << "Label.qml" << "FileSystemStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-    QTest::newRow(":/label->base") << "Label.qml" << "ResourceStyle" << ":/" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-    QTest::newRow("qrc:/label->base") << "Label.qml" << "ResourceStyle" << "qrc:/" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-    QTest::newRow("nosuch/label->base") << "Label.qml" << "NoSuchStyle" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-    QTest::newRow("/nosuch/label->base") << "Label.qml" << "NoSuchStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString();
-
-    // Button.qml exists in all styles including the fs and qrc styles
-    QTest::newRow("button") << "Button.qml" << "" << "data" << "" << testFileUrl("Button.qml").toString();
-    QTest::newRow("/button") << "Button.qml" << "" << dataDirectory() << "" << testFileUrl("Button.qml").toString();
-    QTest::newRow("fs/button") << "Button.qml" << "FileSystemStyle" << "data" << "" << testFileUrl("FileSystemStyle/Button.qml").toString();
-    QTest::newRow("/fs/button") << "Button.qml" << "FileSystemStyle" << dataDirectory() << "" << testFileUrl("FileSystemStyle/Button.qml").toString();
-    QTest::newRow(":/button") << "Button.qml" << "ResourceStyle" << ":/" << "" << "qrc:/ResourceStyle/Button.qml";
-    QTest::newRow("qrc:/button") << "Button.qml" << "ResourceStyle" << "qrc:/" << "" << "qrc:/ResourceStyle/Button.qml";
-    QTest::newRow("nosuch/button") << "Button.qml" << "NoSuchStyle" << "data" << "" << testFileUrl("Button.qml").toString();
-    QTest::newRow("/nosuch/button") << "Button.qml" << "NoSuchStyle" << dataDirectory() << "" << testFileUrl("Button.qml").toString();
-
-    QTest::newRow("button->base") << "Button.qml" << "" << "data" << "FallbackStyle" << testFileUrl("Button.qml").toString();
-    QTest::newRow("/button->base") << "Button.qml" << "" << dataDirectory() << "FallbackStyle" << testFileUrl("Button.qml").toString();
-    QTest::newRow("fs/button->base") << "Button.qml" << "FileSystemStyle" << "data" << "FallbackStyle" << testFileUrl("FileSystemStyle/Button.qml").toString();
-    QTest::newRow("/fs/button->base") << "Button.qml" << "FileSystemStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FileSystemStyle/Button.qml").toString();
-    QTest::newRow(":/button->base") << "Button.qml" << "ResourceStyle" << ":/" << "FallbackStyle" << "qrc:/ResourceStyle/Button.qml";
-    QTest::newRow("qrc:/button->base") << "Button.qml" << "ResourceStyle" << "qrc:/" << "FallbackStyle" << "qrc:/ResourceStyle/Button.qml";
-    QTest::newRow("nosuch/button->base") << "Button.qml" << "NoSuchStyle" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Button.qml").toString();
-    QTest::newRow("/nosuch/button->base") << "Button.qml" << "NoSuchStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FallbackStyle/Button.qml").toString();
-}
-
-void tst_QQuickStyleSelector::select()
-{
-    QFETCH(QString, file);
-    QFETCH(QString, style);
-    QFETCH(QString, path);
-    QFETCH(QString, fallback);
-    QFETCH(QString, expected);
-
-    QQuickStyle::setStyle(QDir(path).filePath(style));
-    QQuickStyle::setFallbackStyle(fallback);
-
-    QQuickStyleSelector selector;
-    selector.addSelector(style);
-    selector.addSelector(fallback);
-    selector.setPaths(QStringList() << dataDirectory() << ":/");
-    QCOMPARE(selector.select(file), expected);
-}
-
-void tst_QQuickStyleSelector::platformSelectors()
-{
-    QQuickStyle::setStyle(QDir(dataDirectory()).filePath("PlatformStyle"));
-
-    QQuickStyleSelector selector;
-    selector.addSelector("PlatformStyle");
-    selector.setPaths(QStringList() << dataDirectory());
-
-#if defined(Q_OS_LINUX)
-    QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+linux/Button.qml").toString());
-#elif defined(Q_OS_MACOS)
-    QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+macos/Button.qml").toString());
-#elif defined(Q_OS_WIN)
-    QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+windows/Button.qml").toString());
-#else
-    QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/Button.qml").toString());
-#endif
-}
-
-QTEST_MAIN(tst_QQuickStyleSelector)
-
-#include "tst_qquickstyleselector.moc"