diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 13:13:27 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 14:39:52 +0000 |
commit | 96da2a94e1b2d25fa39417d9088c9889f504e934 (patch) | |
tree | ee1dd31238269ab6f30f53ce1376d61cba421672 /src/imports/controls/material/qquickmaterialstyle_p.h | |
parent | 9965d9d6c16f3f2e1830efeaf72cdd5f0db711c2 (diff) |
Material style: read theme, accent & primary from qtlabscontrols.conf
Change-Id: Ie55978ae9c76789cf7796752ceefd183c063662b
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index e657fd57..84601de5 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -214,6 +214,8 @@ protected: void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) Q_DECL_OVERRIDE; private: + void init(); + bool m_explicitTheme; bool m_explicitPrimary; bool m_explicitAccent; |