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/particles/images | |
| 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/particles/images')
| -rw-r--r-- | examples/quick/particles/images/colortable.png | bin | 704 -> 571 bytes |
| -rw-r--r-- | examples/quick/particles/images/particle2.png | bin | 3909 -> 1073 bytes |
| -rw-r--r-- | examples/quick/particles/images/particle3.png | bin | 3186 -> 574 bytes |
| -rw-r--r-- | examples/quick/particles/images/particleA.png | bin | 3541 -> 870 bytes |
| -rw-r--r-- | examples/quick/particles/images/sizeInOut.png | bin | 251 -> 132 bytes |
| -rw-r--r-- | examples/quick/particles/images/starfish_mask.png | bin | 11301 -> 7403 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/particles/images/colortable.png b/examples/quick/particles/images/colortable.png Binary files differindex a62ceeb4a0..15509ab5b7 100644 --- a/examples/quick/particles/images/colortable.png +++ b/examples/quick/particles/images/colortable.png diff --git a/examples/quick/particles/images/particle2.png b/examples/quick/particles/images/particle2.png Binary files differindex 36349c6c6e..4f3372cd07 100644 --- a/examples/quick/particles/images/particle2.png +++ b/examples/quick/particles/images/particle2.png diff --git a/examples/quick/particles/images/particle3.png b/examples/quick/particles/images/particle3.png Binary files differindex 905d8f37b8..2b04601403 100644 --- a/examples/quick/particles/images/particle3.png +++ b/examples/quick/particles/images/particle3.png diff --git a/examples/quick/particles/images/particleA.png b/examples/quick/particles/images/particleA.png Binary files differindex c63acdee1f..d86fc9696b 100644 --- a/examples/quick/particles/images/particleA.png +++ b/examples/quick/particles/images/particleA.png diff --git a/examples/quick/particles/images/sizeInOut.png b/examples/quick/particles/images/sizeInOut.png Binary files differindex 0a306ea21a..43d8862dbe 100644 --- a/examples/quick/particles/images/sizeInOut.png +++ b/examples/quick/particles/images/sizeInOut.png diff --git a/examples/quick/particles/images/starfish_mask.png b/examples/quick/particles/images/starfish_mask.png Binary files differindex 2ef74f902b..7ae39b34c5 100644 --- a/examples/quick/particles/images/starfish_mask.png +++ b/examples/quick/particles/images/starfish_mask.png |
