diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
| commit | 7063fefe4b5e866b27001bb9b911fc2f68034e40 (patch) | |
| tree | 1ce35139475d83399572a3265414c2da3443a321 /tests/auto/quick/qquickanimationcontroller | |
| parent | f3446071da8357620d0c8593a04e3b4fbba88f21 (diff) | |
| parent | 4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875
Diffstat (limited to 'tests/auto/quick/qquickanimationcontroller')
| -rw-r--r--[-rwxr-xr-x] | tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml index 8374552974..8374552974 100755..100644 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml index 1a8ca81ba0..1a8ca81ba0 100755..100644 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml |