diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
| commit | 546539562f2aff985e78f3c2426cb711a865ad65 (patch) | |
| tree | a4fac78b563b8b1d4bd40ee13bf5db3f4afdade8 /src/quicktemplates2/qquicktheme_p_p.h | |
| parent | 9c054dd5d2925adbb1ac9745013011a16f78023f (diff) | |
| parent | 49b1e3ff2ac20d8aa8b3889fc76ab4e6907817fd (diff) | |
Merge 5.14 into 5.14.0
Change-Id: I579dc498300e06d747bdc4dba12f7ecd617b6608
Diffstat (limited to 'src/quicktemplates2/qquicktheme_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index c7421677..29058bc8 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickThemePrivate { - Q_DECLARE_PUBLIC(QQuickTheme) - public: static QQuickThemePrivate *get(QQuickTheme *theme) { @@ -70,7 +68,6 @@ public: QScopedPointer<const QPalette> defaultPalette; QSharedPointer<QFont> fonts[NScopes]; QSharedPointer<QPalette> palettes[NScopes]; - QQuickTheme *q_ptr = nullptr; }; QT_END_NAMESPACE |