diff options
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 2 |
2 files changed, 3 insertions, 3 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; |