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 /tests/manual/scenegraph_lancelot | |
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 'tests/manual/scenegraph_lancelot')
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png | bin | 20990 -> 168 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png | bin | 20990 -> 168 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/green_72x96.png | bin | 20990 -> 168 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png | bin | 20990 -> 169 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/red_72x96.png | bin | 20990 -> 167 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/sample_1.png | bin | 28405 -> 27787 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/tile.png | bin | 189 -> 88 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png | bin | 210 -> 117 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png | bin | 20990 -> 169 bytes |
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png | bin | 20990 -> 168 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png Binary files differindex b9e584d8bd..ceddd09b4e 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png Binary files differindex c1ae9f3eee..b465fa9a62 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png Binary files differindex 2ddadde72c..9637f71b74 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png Binary files differindex 2b0f0c961c..1b2c40ae0a 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png Binary files differindex db015768d7..019e5584de 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/sample_1.png b/tests/manual/scenegraph_lancelot/data/shared/sample_1.png Binary files differindex 24d02f4c22..d4dd62f254 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/sample_1.png +++ b/tests/manual/scenegraph_lancelot/data/shared/sample_1.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/tile.png b/tests/manual/scenegraph_lancelot/data/shared/tile.png Binary files differindex 1c54278442..67e21ad80c 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/tile.png +++ b/tests/manual/scenegraph_lancelot/data/shared/tile.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png b/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png Binary files differindex af240b09c3..83b0f7dbbf 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png +++ b/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png Binary files differindex d8ecf51756..382e7eca72 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png diff --git a/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png Binary files differindex 569b6c1dd7..8f60703a4e 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png +++ b/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png |