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 /tests/auto/font | |
| 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 'tests/auto/font')
| -rw-r--r-- | tests/auto/font/tst_font.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp index eb37857a..048739ff 100644 --- a/tests/auto/font/tst_font.cpp +++ b/tests/auto/font/tst_font.cpp @@ -45,7 +45,7 @@ #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h> #include <QtQuickTemplates2/private/qquickcontrol_p.h> #include <QtQuickTemplates2/private/qquickpopup_p.h> -#include <QtQuickTemplates2/private/qquicktheme_p.h> +#include <QtQuickTemplates2/private/qquicktheme_p_p.h> using namespace QQuickVisualTestUtil; @@ -305,7 +305,7 @@ void tst_font::defaultFont() // The call to setData() above causes QQuickDefaultTheme to be set as the current theme, // so we must make sure we only set our theme afterwards. - QQuickTheme::setCurrent(new TestFontTheme); + QQuickThemePrivate::instance.reset(new TestFontTheme); QScopedPointer<QObject> object(component.create()); QVERIFY2(!object.isNull(), qPrintable(component.errorString())); |