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/auto | |
| 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/auto')
14 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/particles/shared/table.png b/tests/auto/particles/shared/table.png Binary files differindex a62ceeb4a0..15509ab5b7 100644 --- a/tests/auto/particles/shared/table.png +++ b/tests/auto/particles/shared/table.png diff --git a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro +++ /dev/null diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png b/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png Binary files differindex 30228cbbdc..b54163f926 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png +++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png diff --git a/tests/auto/qmltest/animators/tst_zeroduration.qml b/tests/auto/qmltest/animators/tst_zeroduration.qml new file mode 100644 index 0000000000..83ce235f42 --- /dev/null +++ b/tests/auto/qmltest/animators/tst_zeroduration.qml @@ -0,0 +1,35 @@ +import QtQuick 2.2 +import QtTest 1.1 + +Item { + id: root; + width: 200 + height: 200 + + TestCase { + id: testCase + name: "animators-y" + when: box.y == 100 + function test_endresult() { + compare(box.yChangeCounter, 1); + var image = grabImage(root); + verify(image.pixel(0, 100) == Qt.rgba(1, 0, 0)); + verify(image.pixel(0, 99) == Qt.rgba(1, 1, 1)); // outside on the top + } + } + + Box { + id: box + + anchors.centerIn: undefined + + YAnimator { + id: animation + target: box + from: 0; + to: 100 + duration: 0 + running: true + } + } +} diff --git a/tests/auto/qmltest/borderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png Binary files differindex dfb62f3d64..57f5aca821 100644 --- a/tests/auto/qmltest/borderimage/colors.png +++ b/tests/auto/qmltest/borderimage/colors.png diff --git a/tests/auto/quick/qquickanimatedimage/data/green.png b/tests/auto/quick/qquickanimatedimage/data/green.png Binary files differindex 0a2e153ba1..4718c00e62 100644 --- a/tests/auto/quick/qquickanimatedimage/data/green.png +++ b/tests/auto/quick/qquickanimatedimage/data/green.png diff --git a/tests/auto/quick/qquickborderimage/data/colors.png b/tests/auto/quick/qquickborderimage/data/colors.png Binary files differindex dfb62f3d64..57f5aca821 100644 --- a/tests/auto/quick/qquickborderimage/data/colors.png +++ b/tests/auto/quick/qquickborderimage/data/colors.png diff --git a/tests/auto/quick/qquickimage/data/colors.png b/tests/auto/quick/qquickimage/data/colors.png Binary files differindex dfb62f3d64..57f5aca821 100644 --- a/tests/auto/quick/qquickimage/data/colors.png +++ b/tests/auto/quick/qquickimage/data/colors.png diff --git a/tests/auto/quick/qquickimage/data/colors1.png b/tests/auto/quick/qquickimage/data/colors1.png Binary files differindex dfb62f3d64..57f5aca821 100644 --- a/tests/auto/quick/qquickimage/data/colors1.png +++ b/tests/auto/quick/qquickimage/data/colors1.png diff --git a/tests/auto/quick/qquickimage/data/green.png b/tests/auto/quick/qquickimage/data/green.png Binary files differindex 0a2e153ba1..4718c00e62 100644 --- a/tests/auto/quick/qquickimage/data/green.png +++ b/tests/auto/quick/qquickimage/data/green.png diff --git a/tests/auto/quick/qquickimage/data/rect.png b/tests/auto/quick/qquickimage/data/rect.png Binary files differindex d564a2d5a5..fe839a40e4 100644 --- a/tests/auto/quick/qquickimage/data/rect.png +++ b/tests/auto/quick/qquickimage/data/rect.png diff --git a/tests/auto/quick/qquickpixmapcache/data/massive.png b/tests/auto/quick/qquickpixmapcache/data/massive.png Binary files differindex bc6cc9e6ca..9a3e0e112f 100644 --- a/tests/auto/quick/qquickpixmapcache/data/massive.png +++ b/tests/auto/quick/qquickpixmapcache/data/massive.png diff --git a/tests/auto/quick/qquickstates/data/image.png b/tests/auto/quick/qquickstates/data/image.png Binary files differindex ed1833c95b..0e681ba1e1 100644 --- a/tests/auto/quick/qquickstates/data/image.png +++ b/tests/auto/quick/qquickstates/data/image.png diff --git a/tests/auto/quick/qquickwindow/data/colors.png b/tests/auto/quick/qquickwindow/data/colors.png Binary files differindex dfb62f3d64..57f5aca821 100644 --- a/tests/auto/quick/qquickwindow/data/colors.png +++ b/tests/auto/quick/qquickwindow/data/colors.png |
