diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-28 11:51:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-30 17:03:01 +0000 |
| commit | c2737ab795bd86c7ead36f36474a1aabf4f0c349 (patch) | |
| tree | 6daabb8c59bf1cba07245b10d59eafea1e26caa0 /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | 4b09f9ffdc7b5fd3c4e18d9fff3350390baac130 (diff) | |
Remove QQuickMaterialStylePrivate
This paves the road for QQuickStyle, a common base class for
QQuickMaterialStyle and QQuickUniversalStyle. QQuickStyle will
be in a static library -> no BC requirements -> no pimpl.
Change-Id: Ibac37bef3a9282a3b7aaf29c4de854cab3cd8d7d
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 8788d5e0..1d2033e7 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -49,8 +49,10 @@ // #include <QtQml/qqml.h> +#include <QtCore/qset.h> #include <QtGui/qcolor.h> #include <QtCore/qobject.h> +#include <QtCore/qpointer.h> #include <QtQuick/private/qquickitemchangelistener_p.h> QT_BEGIN_NAMESPACE @@ -213,8 +215,15 @@ protected: void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE; private: - Q_DISABLE_COPY(QQuickMaterialStyle) - Q_DECLARE_PRIVATE(QQuickMaterialStyle) + QPointer<QQuickMaterialStyle> m_parentStyle; + QSet<QQuickMaterialStyle *> m_childStyles; + + bool m_explicitTheme; + bool m_explicitPrimary; + bool m_explicitAccent; + Theme m_theme; + Color m_primary; + Color m_accent; }; QT_END_NAMESPACE |