diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:37 +0200 |
| commit | b9eca979f8557aa1d7f3cb1af01284720d23a425 (patch) | |
| tree | 7bbc1cc7b17a6c65e43352dd55bfa77f5b2d5c39 /tests/auto/qml/debugger | |
| parent | 1148d3acead3c13072876b873fb4ee9440921943 (diff) | |
| parent | dab3fa107fa7b4a82928b71748b857ff85180f1e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I48c493b537e65276107ed7ee029312e294947e8b
Diffstat (limited to 'tests/auto/qml/debugger')
| -rw-r--r-- | tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro | 0 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png | bin | 158 -> 67 bytes |
2 files changed, 0 insertions, 0 deletions
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 |
