diff options
| -rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 4 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/palette/tst_palette.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp index 5ddc6f30..b94b4198 100644 --- a/src/quicktemplates2/qquicktheme.cpp +++ b/src/quicktemplates2/qquicktheme.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -QScopedPointer<QQuickTheme> QQuickThemePrivate::instance; +std::unique_ptr<QQuickTheme> QQuickThemePrivate::instance; static void cleanup_instance() { @@ -117,7 +117,7 @@ QQuickTheme::~QQuickTheme() QQuickTheme *QQuickTheme::instance() { - return QQuickThemePrivate::instance.data(); + return QQuickThemePrivate::instance.get(); } QFont QQuickTheme::font(Scope scope) diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index 29058bc8..b2c40eeb 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -60,7 +60,7 @@ public: return theme->d_func(); } - static QScopedPointer<QQuickTheme> instance; + static std::unique_ptr<QQuickTheme> instance; static const int NScopes = QQuickTheme::Tumbler + 1; diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp index d81625db..ca1675f1 100644 --- a/tests/auto/palette/tst_palette.cpp +++ b/tests/auto/palette/tst_palette.cpp @@ -304,7 +304,7 @@ void tst_palette::defaultPalette() // The call to setData() above causes QQuickBasicTheme to be set as the current theme, // so we must make sure we only set our theme afterwards. - std::unique_ptr<QQuickTheme> oldTheme(QQuickThemePrivate::instance.take()); + std::unique_ptr<QQuickTheme> oldTheme(QQuickThemePrivate::instance.release()); QQuickThemePrivate::instance.reset(new TestTheme); QScopedPointer<QObject> object(component.create()); |