From 9338e1285e47060f3998ac19d047e93a11252ffb Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 15 May 2018 23:29:46 +0200 Subject: Rename QQuickTheme::current to instance Avoid giving a wrong impression that the theme instance could be changed on the fly. Change-Id: Ifb5078422385d2f15da6a416d89cc9d6f46b0f40 Reviewed-by: Mitch Curtis --- src/quickcontrols2/qquickstyleplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quickcontrols2') diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp index 6bf93046..c42ba88d 100644 --- a/src/quickcontrols2/qquickstyleplugin.cpp +++ b/src/quickcontrols2/qquickstyleplugin.cpp @@ -58,8 +58,8 @@ QQuickStylePlugin::QQuickStylePlugin(QObject *parent) QQuickStylePlugin::~QQuickStylePlugin() { Q_D(QQuickStylePlugin); - if (QQuickTheme::current() == d->theme) - QQuickTheme::setCurrent(nullptr); + if (QQuickTheme::instance() == d->theme) + QQuickThemePrivate::instance.reset(); } void QQuickStylePlugin::registerTypes(const char *uri) @@ -89,7 +89,7 @@ void QQuickStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) p->defaultPalette.reset(QQuickStylePrivate::readPalette(settings)); } #endif - QQuickTheme::setCurrent(d->theme); + QQuickThemePrivate::instance.reset(d->theme); } } } -- cgit v1.2.3