diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 16:11:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:33:04 +0200 |
| commit | 27681cba4695355f2a0a6b01b85c429186d11a34 (patch) | |
| tree | f11df2ec52d983b552f2e1b673e0845bc7e3ef05 /tests/auto/integration | |
| parent | f7a93757c709e8b2902bc4707752edb8649d009c (diff) | |
| parent | bc53bb7913bbf68519508a0ab76c513335b3e5bb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Blacklisted a few functions in tst_QAudioInput.
Conflicts:
.qmake.conf
src/plugins/avfoundation/camera/avfcameracontrol.mm
src/plugins/avfoundation/camera/avfcameraservice.h
src/plugins/avfoundation/camera/avfcameraservice.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
src/plugins/avfoundation/camera/avfimageencodercontrol.mm
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
tests/auto/integration/qaudioinput/BLACKLIST
Task-number: QTBUG-54459
Task-number: QTBUG-49736
Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qaudioinput/BLACKLIST | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST index ab3f9e037..994ea8f38 100644 --- a/tests/auto/integration/qaudioinput/BLACKLIST +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -1,8 +1,9 @@ #QTBUG-49736 [pushSuspendResume] -redhatenterpriselinuxworkstation-6.6 -rhel-7.2 -ubuntu-14.04 -ubuntu-16.04 -opensuse-13.1 -opensuse-42.1 +linux +[pull] +linux +[pullSuspendResume] +linux +[push] +linux |