aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qquicktheme.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove ThemeMitch Curtis2015-11-271-620/+0
| | | | | | | | | Given the presence of alternative styles, we'd like to focus on making the default style as performant as possible. Removing Theme usage is a step towards this. Change-Id: I8f76dc98442e6c02703885591a44758f40c7a362 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Flat style: fix inheritance for re-parented itemsJ-P Nurmi2015-10-221-2/+2
| | | | | Change-Id: I33e77f93477b20a4f7af4f10fa8dde95fad1863a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Share style inheritance related helpersJ-P Nurmi2015-10-221-100/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Usage: # +material/material.pro include(../shared/shared.pri) // qquickmaterialstyle.cpp #include "qquickstyle_p.h" QQuickMaterialStyle *style = QQuickStyle::instance<QQuickMaterialStyle>(item); // ... QQuickMaterialStyle *parent = QQuickStyle::findParent<QQuickMaterialStyle>(this); // ... QList<QQuickMaterialStyle *> children = QQuickStyle::findChildren<QQuickMaterialStyle>(object); // ... Change-Id: I2c01a1aa36805f16d83fa60ab25b2cc29e6a43cc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix crash in theme code when loading engines in successionJ-P Nurmi2015-10-091-5/+6
| | | | | | | | | | | | Store global engine specific themes as dynamic properties on the engines themselves. This avoids the problem that storing engines and their themes to a hash map had that destroyed engines and themes were not cleaned up from the hash map. Change-Id: I7330995339c263d456f74d33f6535d5ac7d9d5d4 Task-number: QTBUG-48651 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-13/+13
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Replaced the module name qualifier used for QML docsVenugopal Shivashankar2015-09-231-10/+10
| | | | | | | | Also made changes to avoid qdoc warnings about qml snippets. Change-Id: Ide047fe7a4901fcf4b03efdccf457662e60585d2 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove non-color properties from ThemeJ-P Nurmi2015-07-061-124/+1
| | | | | | | | Better start with a minimal set. It will be also easier to transition from Theme to Palette if it gets done. Change-Id: Ic9951ac5b913f99a84e2b8efb9ae7f8d61177aee Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Remove Theme.disabledOpacityJ-P Nurmi2015-06-301-42/+1
| | | | | | | Use Theme.disabledColor instead. Change-Id: I76311d6c6b573b01a26ee2b8d434a841c4d86292 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickTheme -> QQuickThemeAttachedJ-P Nurmi2015-06-141-211/+211
| | | | | | | Follow the QtQuick conventions & make tst_sanity easier. Change-Id: Ic722383ca09de2bd53ee81177297ecafdf6a9cf7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Theme: fix int->realJ-P Nurmi2015-05-221-15/+15
| | | | | Change-Id: I9833aee821e4c7d436e0c999dbeefe3e12b34875 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Theme::disabledColorJ-P Nurmi2015-04-231-0/+41
| | | | | Change-Id: I8bfc5a89aa75addd4cb1a5c0d5b58ea8b2bcf67c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-081-0/+826
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>