diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:56:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 13:03:25 +0200 |
| commit | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (patch) | |
| tree | 8fdc2922aa5375203fef05746691e88632a92bbe /examples/quick/customitems | |
| parent | 0d8de448ef746aea7215f6f654660500dc9601d2 (diff) | |
| parent | a676e4e2dae945c02521691c7018f5a5534feff9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.
Conflicts:
src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
src/qml/qml/ftw/qhashfield_p.h
tests/benchmarks/particles/affectors/tst_affectors.cpp
tests/benchmarks/particles/emission/tst_emission.cpp
tests/benchmarks/qml/pointers/pointers.pro
tests/benchmarks/qml/pointers/tst_pointers.cpp
tests/benchmarks/qml/qmltime/qmltime.pro
tests/benchmarks/qml/qquickwindow/qquickwindow.pro
Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
Diffstat (limited to 'examples/quick/customitems')
| -rw-r--r-- | examples/quick/customitems/maskedmousearea/images/cloud_1.png | bin | 49524 -> 49395 bytes |
| -rw-r--r-- | examples/quick/customitems/progressbar/content/background.png | bin | 426 -> 299 bytes |
| -rw-r--r-- | examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png | bin | 159568 -> 157358 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/clear.png | bin | 429 -> 320 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/lineedit-bg-focus.png | bin | 526 -> 297 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/lineedit-bg.png | bin | 426 -> 299 bytes |
| -rw-r--r-- | examples/quick/customitems/spinner/content/spinner-bg.png | bin | 345 -> 274 bytes |
| -rw-r--r-- | examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png | bin | 5298 -> 4798 bytes |
| -rw-r--r-- | examples/quick/customitems/tabwidget/doc/images/tab.png | bin | 507 -> 309 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/customitems/maskedmousearea/images/cloud_1.png b/examples/quick/customitems/maskedmousearea/images/cloud_1.png Binary files differindex 87c54af253..9beb7e8442 100644 --- a/examples/quick/customitems/maskedmousearea/images/cloud_1.png +++ b/examples/quick/customitems/maskedmousearea/images/cloud_1.png diff --git a/examples/quick/customitems/progressbar/content/background.png b/examples/quick/customitems/progressbar/content/background.png Binary files differindex 9044226f85..5c316bc03e 100644 --- a/examples/quick/customitems/progressbar/content/background.png +++ b/examples/quick/customitems/progressbar/content/background.png diff --git a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png Binary files differindex 54adf33daa..2c80421b06 100644 --- a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png +++ b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png diff --git a/examples/quick/customitems/searchbox/images/clear.png b/examples/quick/customitems/searchbox/images/clear.png Binary files differindex 91eb270695..c20a9cfba5 100644 --- a/examples/quick/customitems/searchbox/images/clear.png +++ b/examples/quick/customitems/searchbox/images/clear.png diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png Binary files differindex bbfac38d2d..c8f2722298 100644 --- a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png +++ b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg.png b/examples/quick/customitems/searchbox/images/lineedit-bg.png Binary files differindex 9044226f85..5c316bc03e 100644 --- a/examples/quick/customitems/searchbox/images/lineedit-bg.png +++ b/examples/quick/customitems/searchbox/images/lineedit-bg.png diff --git a/examples/quick/customitems/spinner/content/spinner-bg.png b/examples/quick/customitems/spinner/content/spinner-bg.png Binary files differindex b3556f1f9f..da34fc4090 100644 --- a/examples/quick/customitems/spinner/content/spinner-bg.png +++ b/examples/quick/customitems/spinner/content/spinner-bg.png diff --git a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png Binary files differindex 847052d301..2e1cae2584 100644 --- a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png +++ b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png diff --git a/examples/quick/customitems/tabwidget/doc/images/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png Binary files differindex ad8021605f..2ea989b68d 100644 --- a/examples/quick/customitems/tabwidget/doc/images/tab.png +++ b/examples/quick/customitems/tabwidget/doc/images/tab.png |
