aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle_p.h
Commit message (Expand)AuthorAgeFilesLines
* Rename QQuickStyleAttached to QQuickAttachedObjectJ-P Nurmi2017-03-221-3/+3
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-111-1/+1
|\
| * Welcome to 2017J-P Nurmi2017-01-091-1/+1
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-171-1/+1
|\|
| * Material: de-couple foreground and primaryTextColorJ-P Nurmi2016-11-161-1/+1
* | Whitespace cleanupsJ-P Nurmi2016-11-031-1/+0
|/
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-191-0/+4
|\
| * Material: introduce an active and disabled icon colorsKonstantin Ritt2016-10-171-0/+4
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-141-2/+0
|\|
| * Remove unused QQuickMaterialStylePrivate forward declarationMitch Curtis2016-09-121-2/+0
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-061-0/+2
|\|
| * Material: fix ToolBar to respect Material.backgroundJ-P Nurmi2016-09-061-0/+2
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-021-2/+0
|\|
| * Cleanup unused QQuickMaterialStyle::drawerBackgroundColorJ-P Nurmi2016-09-021-2/+0
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-231-0/+10
|\|
| * Material: document the attached style propertiesMitch Curtis2016-08-191-0/+10
* | Material: rename ripple color propertiesJ-P Nurmi2016-07-211-4/+4
* | QQuickMaterialStyle: cleanup several unused colorsJ-P Nurmi2016-07-211-17/+1
* | Material: tweak ScrollBar looks and behaviorJ-P Nurmi2016-07-181-0/+2
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-011-0/+2
|\|
| * SpinBox: disable up and down indicators when appropriateMitch Curtis2016-05-241-0/+2
* | Introduce a 'System' theme to the styles.Friedemann Kleint2016-05-261-1/+2
|/
* Material: fix flat button colorsNikita Krupenko2016-05-091-2/+0
* Material: set correct ToolBar foreground color for built-in primariesJ-P Nurmi2016-05-091-0/+2
* Material: use proper shade for light and dark themeNikita Krupenko2016-05-091-0/+1
* Material: Add proper elevation supportMichael Spencer2016-05-041-18/+29
* Material: add foreground and background attached propertiesJ-P Nurmi2016-04-151-2/+26
* Add QQuickMaterialStyle::variantToRgba()J-P Nurmi2016-04-151-0/+1
* Controls: update license headersJ-P Nurmi2016-04-141-2/+2
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-1/+1
* Introduce ToolTipJ-P Nurmi2016-03-221-0/+2
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-1/+1
* Rename QQuickStyle to QQuickStyleAttachedJ-P Nurmi2016-03-161-3/+3
* Add SwipeDelegateMitch Curtis2016-03-151-0/+8
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-0/+2
|\
| * ItemDelegate: make the highlight visible against any backgroundJ-P Nurmi2016-02-151-0/+2
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-0/+13
|\|
| * Restore Material::primaryJ-P Nurmi2016-01-201-0/+13
* | C++11 keywordsJ-P Nurmi2016-01-211-2/+2
|/
* Material: add support for user-defined accent colorsJ-P Nurmi2016-01-141-7/+9
* Remove unused Material::primaryJ-P Nurmi2015-12-251-14/+0
* Material style for MenuJ-P Nurmi2015-12-181-2/+2
* Add Overlay::background that is shown when any modal popup is openJ-P Nurmi2015-12-151-0/+2
* Material style: read theme, accent & primary from qtlabscontrols.confJ-P Nurmi2015-12-141-0/+2
* Add ComboBoxJ-P Nurmi2015-12-041-0/+2
* Add QQuickStyleJ-P Nurmi2015-12-021-12/+6
* Remove QQuickMaterialStylePrivateJ-P Nurmi2015-11-301-2/+11
* Visualize Material Button's highlighted stateMitch Curtis2015-11-231-0/+10
* Add Material styleMitch Curtis2015-11-121-0/+214