diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:03:28 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-01 07:28:44 +0000 |
| commit | a330616496cf14e53db344513889444c6d60e7de (patch) | |
| tree | 8e2b88bfbadfacb3c684dc7dc2fd8b18321e81ba /tests | |
| parent | 48206ccc29154a2ebdbe14c549c84b2e590b6a06 (diff) | |
| parent | 545959e45ec86c70617f4839d20d931297c30c20 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/video/qvideoframe.h
Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index a61352a18..9ec26021f 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -39,6 +39,8 @@ #include "../shared/mediafileselector.h" //TESTED_COMPONENT=src/multimedia +#include <QtMultimedia/private/qtmultimedia-config_p.h> + QT_USE_NAMESPACE /* @@ -1358,8 +1360,10 @@ void tst_QMediaPlayerBackend::surfaceTest_data() QTest::newRow("RGB formats") << formatsRGB; +#if !QT_CONFIG(directshow) QTest::newRow("YVU formats") << formatsYUV; +#endif QTest::newRow("RGB & YUV formats") << formatsRGB + formatsYUV; |