diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 20:40:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 21:41:33 +0200 |
| commit | 026353c74a6343281045d42e717cd67e52aaf24c (patch) | |
| tree | 1ad36ce6a7e57d10df808715981bf07c9a6462d6 /examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png | |
| parent | 0385c432962418431ec5fb4a80d57a5dd9926c6e (diff) | |
| parent | 6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Fusion style ComboBox popup height was adjusted according to 90a0d402
to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass
with the Fusion style.
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
Diffstat (limited to 'examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png')
| -rw-r--r-- | examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png | bin | 0 -> 958 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png Binary files differnew file mode 100644 index 00000000..088c15b8 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png |