diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 13:36:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 13:36:27 +0200 |
| commit | 983bd3ecedf2b1c9fa68ee9cc4edc7d1be59ff37 (patch) | |
| tree | de06f175521d481ebb69e8116d95ea7434aa93ac /tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | |
| parent | 1a34596b426f8a685453699ad44c45075a6c3681 (diff) | |
| parent | 026aec5079375c866cd88ba176c88d2842d1b260 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
Diffstat (limited to 'tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp')
0 files changed, 0 insertions, 0 deletions