diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:38 +0200 |
| commit | 318159c8492883d7ef29804a68c398cceaa5f89a (patch) | |
| tree | 0ff2aa045f10b54438242d83102d588a89ef020c /tests/auto/integration | |
| parent | b0a50235bc8b59896478e7b238dbeb463f948863 (diff) | |
| parent | d50a09965ae53e02caabdbcf4994ed9bc0ea3293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ia6a6b6fce7aeca446b5e87ff72076fb8be2ada04
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudioinput/tst_qaudioinput.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudioinput/wavheader.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudioinput/wavheader.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudiooutput/wavheader.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/integration/qaudiooutput/wavheader.h | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 242787841..242787841 100755..100644 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp diff --git a/tests/auto/integration/qaudioinput/wavheader.cpp b/tests/auto/integration/qaudioinput/wavheader.cpp index adb28e7a7..adb28e7a7 100755..100644 --- a/tests/auto/integration/qaudioinput/wavheader.cpp +++ b/tests/auto/integration/qaudioinput/wavheader.cpp diff --git a/tests/auto/integration/qaudioinput/wavheader.h b/tests/auto/integration/qaudioinput/wavheader.h index 04fd951f6..04fd951f6 100755..100644 --- a/tests/auto/integration/qaudioinput/wavheader.h +++ b/tests/auto/integration/qaudioinput/wavheader.h diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 81aa97d91..81aa97d91 100755..100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp diff --git a/tests/auto/integration/qaudiooutput/wavheader.cpp b/tests/auto/integration/qaudiooutput/wavheader.cpp index adb28e7a7..adb28e7a7 100755..100644 --- a/tests/auto/integration/qaudiooutput/wavheader.cpp +++ b/tests/auto/integration/qaudiooutput/wavheader.cpp diff --git a/tests/auto/integration/qaudiooutput/wavheader.h b/tests/auto/integration/qaudiooutput/wavheader.h index 04fd951f6..04fd951f6 100755..100644 --- a/tests/auto/integration/qaudiooutput/wavheader.h +++ b/tests/auto/integration/qaudiooutput/wavheader.h |