diff options
Diffstat (limited to 'src/quickcontrols2/qquickstyleplugin.cpp')
-rw-r--r-- | src/quickcontrols2/qquickstyleplugin.cpp | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp index 9bbaad11..067d8dff 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. @@ -37,18 +37,14 @@ #include "qquickstyleplugin_p.h" #include "qquickstyle.h" #include "qquickstyle_p.h" -#include "qquickstyleselector_p.h" -QT_BEGIN_NAMESPACE +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlfile.h> -class QQuickStylePluginPrivate -{ -public: - mutable QScopedPointer<QQuickStyleSelector> selector; -}; +QT_BEGIN_NAMESPACE QQuickStylePlugin::QQuickStylePlugin(QObject *parent) - : QQmlExtensionPlugin(parent), d_ptr(new QQuickStylePluginPrivate) + : QQmlExtensionPlugin(parent) { } @@ -66,34 +62,8 @@ void QQuickStylePlugin::initializeTheme(QQuickTheme *theme) Q_UNUSED(theme); } -void QQuickStylePlugin::unregisterTypes() +void QQuickStylePlugin::registerTypes(const char */*uri*/) { - 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); } QT_END_NAMESPACE |