1 files changed, 13 insertions, 37 deletions
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp
index c35c8735..1f1c3875 100644
--- a/src/quickcontrols2/qquickstyleplugin.cpp
+++ b/src/quickcontrols2/qquickstyleplugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
@@ -34,21 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qquickstyleplugin_p.h"
 #include "qquickstyle.h"
 #include "qquickstyle_p.h"
-#include "qquickstyleselector_p.h"
+#include "qquickstyleplugin_p.h"
+
+#include <QtCore/qloggingcategory.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlfile.h>
+
+#include <QtQuickTemplates2/private/qquicktheme_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickStylePluginPrivate
-{
-public:
-    mutable QScopedPointer<QQuickStyleSelector> selector;
-};
+Q_LOGGING_CATEGORY(lcStylePlugin, "qt.quick.controls.styleplugin")
 
 QQuickStylePlugin::QQuickStylePlugin(QObject *parent)
-    : QQmlExtensionPlugin(parent), d_ptr(new QQuickStylePluginPrivate)
+    : QQmlExtensionPlugin(parent)
 {
 }
 
@@ -61,39 +62,14 @@ QString QQuickStylePlugin::name() const
     return QString();
 }
 
-void QQuickStylePlugin::initializeTheme(QQuickTheme *theme)
+void QQuickStylePlugin::registerTypes(const char *uri)
 {
-    Q_UNUSED(theme)
+    qCDebug(lcStylePlugin).nospace() << "registerTypes called with uri " << uri << "; plugin name is " << name();
 }
 
 void QQuickStylePlugin::unregisterTypes()
 {
-    Q_D(QQuickStylePlugin);
-    // Destroy the selector so that it is recreated in resolvedUrl() and
-    // any new style that has been set at runtime will be accounted for when selecting QML files.
-    d->selector.reset();
-}
-
-QUrl QQuickStylePlugin::resolvedUrl(const QString &fileName) const
-{
-    Q_D(const QQuickStylePlugin);
-    if (!d->selector) {
-        d->selector.reset(new QQuickStyleSelector);
-        const QString style = QQuickStyle::name();
-        if (!style.isEmpty())
-            d->selector->addSelector(style);
-
-        const QString fallback = QQuickStylePrivate::fallbackStyle();
-        if (!fallback.isEmpty() && fallback != style)
-            d->selector->addSelector(fallback);
-
-        const QString theme = name();
-        if (!theme.isEmpty() && theme != style)
-            d->selector->addSelector(theme);
-
-        d->selector->setPaths(QQuickStylePrivate::stylePaths(true));
-    }
-    return d->selector->select(fileName);
+    qCDebug(lcStylePlugin) << "unregisterTypes called; plugin name is" << name();
 }
 
 QT_END_NAMESPACE