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/quicktemplates2/qquicktheme_p_p.h | |
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/quicktemplates2/qquicktheme_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index e9593865..e43c8034 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -65,7 +65,7 @@ public: const QFont *resolveThemeFont(QQuickTheme::Scope scope); const QPalette *resolveThemePalette(QQuickTheme::Scope scope); - static QScopedPointer<QQuickTheme> current; + static QScopedPointer<QQuickTheme> instance; bool hasResolvedFonts = false; bool hasResolvedPalettes = false; |