diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /tests | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index 3f13c4267..a529517d3 100644 --- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp @@ -118,7 +118,9 @@ private slots: void testMediaStatus_data(); void testMediaStatus(); void testPlaylist(); +#ifndef QT_NO_BEARERMANAGEMENT void testNetworkAccess(); +#endif void testSetVideoOutput(); void testSetVideoOutputNoService(); void testSetVideoOutputNoControl(); @@ -1063,6 +1065,7 @@ void tst_QMediaPlayer::testDestructor() mockProvider->deleteServiceOnRelease = false; } +#ifndef QT_NO_BEARERMANAGEMENT void tst_QMediaPlayer::testNetworkAccess() { QNetworkConfigurationManager manager; @@ -1090,6 +1093,7 @@ void tst_QMediaPlayer::testNetworkAccess() QVERIFY(config.isValid() == false); QVERIFY(player->currentNetworkConfiguration().isValid() == false); } +#endif void tst_QMediaPlayer::testSetVideoOutput() { |