aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickmaterialstyle/data/tst_material.qml
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-061-22/+70
|\
| * tst_material: test the background of some more controlsJ-P Nurmi2016-09-061-34/+42
| * Material: fix popups to respect Material.backgroundJ-P Nurmi2016-09-061-0/+40
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-021-0/+29
|\|
| * Material: ignore Material.background unless explicitly setMitch Curtis2016-09-021-0/+29
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-081-3/+3
|/
* Rename tst_material and tst_universalJ-P Nurmi2016-06-131-0/+603