diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 09:25:50 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 09:25:50 +0100 |
| commit | efcc1a0b9ec1d10cfea5b8cde8f042dbe0b66fa8 (patch) | |
| tree | 489084d4e73864798acea39f4e7199541b6f586f /src/imports/controls/material/qquickmaterialtheme_p.h | |
| parent | 7f3a6848c09615bf4ed7d96ab80be6ca8707af54 (diff) | |
| parent | fec1a78618bae112ff8d1c0e6f078ea890cf283e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/controls/qquickstyle.cpp
src/controls/qquickstyleattached_p.h
src/imports/controls/material/qquickmaterialstyle.cpp
src/templates/qquickcontrol.cpp
src/templates/qquickpopup.cpp
Change-Id: I17c3c4d1040b89838f0903e0a17069b835895199
Diffstat (limited to 'src/imports/controls/material/qquickmaterialtheme_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialtheme_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index 27ffdddc..af899c6f 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -66,7 +66,6 @@ public: private: QFont systemFont; QFont buttonFont; - QFont toolButtonFont; QFont itemViewFont; QFont menuItemFont; }; |