diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-04-02 11:51:21 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-26 11:45:48 +0200 |
| commit | ef771a0fd70f05d7204fb8cbd8789aa1ed6eff4b (patch) | |
| tree | a42ee55e8bf0c1af8d69f1578945229eb7790c25 /src/quickcontrols2/qquickstyleplugin_p.h | |
| parent | 2ba4a895a48be6927818008580ab0a88cc8c4e12 (diff) | |
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>
Diffstat (limited to 'src/quickcontrols2/qquickstyleplugin_p.h')
| -rw-r--r-- | src/quickcontrols2/qquickstyleplugin_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/quickcontrols2/qquickstyleplugin_p.h b/src/quickcontrols2/qquickstyleplugin_p.h index 67103e12..a9700c15 100644 --- a/src/quickcontrols2/qquickstyleplugin_p.h +++ b/src/quickcontrols2/qquickstyleplugin_p.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE class QQuickTheme; -class QQuickStylePluginPrivate; class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStylePlugin : public QQmlExtensionPlugin { @@ -66,14 +65,11 @@ public: virtual QString name() const; virtual void initializeTheme(QQuickTheme *theme); - virtual void unregisterTypes() override; - QUrl resolvedUrl(const QString &fileName) const; + void registerTypes(const char *uri) override; private: Q_DISABLE_COPY(QQuickStylePlugin) - Q_DECLARE_PRIVATE(QQuickStylePlugin) - QScopedPointer<QQuickStylePluginPrivate> d_ptr; }; QT_END_NAMESPACE |