| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/5.6' into dev | J-P Nurmi | 2016-01-28 | 1 | -5/+5 |
| | | | | | | | | | | | | Conflicts: src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/templates/qquickapplicationwindow_p.h src/templates/qquickcombobox.cpp src/templates/qquickcombobox_p.h src/templates/qquickpopup.cpp Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478 | ||||
| * | Material ProgressBar: implement indeterminate animator | J-P Nurmi | 2016-01-28 | 1 | -0/+101 |
| The indicator is now a single QQuickItem, and runs in the render thread, so keeps animating even if the app is busy. Before: RESULT : tst_CreationTime::material():"ProgressBar": 0.30 msecs per iteration (total: 79, iterations: 256) After: RESULT : tst_CreationTime::material():"ProgressBar": 0.18 msecs per iteration (total: 93, iterations: 512) Change-Id: I3ec0982da9a02751725692c72da10a01d2afbfdc Task-number: QTBUG-50161 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> | |||||
 |
index : qt/qtquickcontrols2.git | |
| Qt Quick Controls 2 |
| aboutsummaryrefslogtreecommitdiffstats |