aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickiconlabel
Commit message (Collapse)AuthorAgeFilesLines
* tst_qquickiconlabel: skip colorChanges() that grabToImage() on offscreen ↵Liang Qi2018-01-251-0/+3
| | | | | | | | | | | | | platforms The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Change-Id: Ifac43dfa26182e3b518397fa070bb4d4a62114e0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Bump QtQuick 2.9 imports to 2.10Mitch Curtis2017-09-064-4/+4
| | | | | Change-Id: I274146911cd8a204fcbf439da9259b0a38c8092e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickIconLabel: ensure that icon color changes are respectedMitch Curtis2017-05-152-0/+96
| | | | | | | | | | | updateIcon() is no longer called, so we can move its contents into syncImage(), which is called by updateOrSyncImage(), which is called by QQuickIconLabel::setIcon().. which is called each time any of the icon properties change (now that it's a value type). Task-number: QTBUG-60807 Change-Id: Id1ff875e0855bd76755d49466f82c2eac36ffd09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Make QQuickIcon a value typeJ-P Nurmi2017-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickIcon no longer inherits QObject, but becomes a light-weight implicitly shared Q_GADGET-type, that is passed by value the same way fonts and colors are. Before: SUB: OS: Fedora 25 (Workstation Edition) SUB: QPA: xcb SUB: GL_VENDOR: Intel Open Source Technology Center SUB: GL_RENDERER: Mesa DRI Intel(R) Haswell Desktop SUB: GL_VERSION: 3.0 Mesa 13.0.4 SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 110 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: Average: SUB: 109.2 frames; using samples; MedianAll=109; StdDev=0.447214, CoV=0.00409536 After: [...] SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 123 frames SUB: 124 frames SUB: 124 frames SUB: 122 frames SUB: 125 frames SUB: Average: SUB: 123.6 frames; using samples; MedianAll=124; StdDev=1.14018, CoV=0.00922472 Change-Id: I604532204fb94fc0726d0c9b8b6097f9ebc265e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickIconLabel: create icon and label items lazilyJ-P Nurmi2017-04-114-41/+36
| | | | | | | | | | | | | | Before: Average: 120.2 frames; using samples; MedianAll=120; StdDev=0.447214, CoV=0.00372058 After: Average: 129.8 frames; using samples; MedianAll=130; StdDev=0.447214, CoV=0.00344541 Task-number: QTBUG-59746 Change-Id: I44b521688cd60e7e287968828f9d4062cc642a0d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Implement QQuickIconLabel::TextUnderIconJ-P Nurmi2017-04-111-0/+29
| | | | | | | This will be the default for TabButton and RoundButton. Change-Id: I9ccb0d35f33a80fe7e3da26617ed6f42232afe17 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickIconLabel: rename text property to labelMitch Curtis2017-04-083-6/+6
| | | | | | | | In preparation for the next patch which adds a "QString text" property to the API. Change-Id: Ie904108353c37a02cbc992c067f3e09aed9c2497 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickIconLabel: remove change signalsMitch Curtis2017-04-081-10/+0
| | | | | | | No QML code relies on these. Change-Id: I9311d80b8d53914e1db7aa37ed9388c279f0563a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename QQuickDisplayLayout to QQuickIconLabelMitch Curtis2017-04-075-0/+490
There are some performance improvements planned that require changes to the class, resulting in it no longer being a layout "container". Change-Id: Ie29f2f95eebb64b3b018746f93763fdbe79625f0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>