diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-15 23:29:46 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-16 08:10:05 +0000 |
| commit | 9338e1285e47060f3998ac19d047e93a11252ffb (patch) | |
| tree | 507d94919d8f0d83b78606564fe1cf408d78ddd0 /src/quickcontrols2 | |
| parent | 9d442922425f36d96f68f4fff83f3aca90aea6df (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquickstyleplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } } } |