diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-30 22:03:42 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-30 22:04:42 +0100 |
| commit | 6c55554af5835f9b8528ae4e9c77a8f48dd25cf1 (patch) | |
| tree | 59f2ec9e1bc7f07fe4430484919f01136295df3f /tests | |
| parent | 4f1dcd081cc4f9b1ee475a7d0cb45d31be18ac56 (diff) | |
| parent | e4c627ecc2ade9de3cf795f6f5f245be0d3a8e85 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I840b63f6d6fc8ff974d256e26732bf54937256cc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp index 66ace2045..4167b18ea 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp @@ -75,10 +75,10 @@ public: QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const { + QMediaServiceProviderHint::Features result; if (service == QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)) - return QMediaServiceProviderHint::LowLatencyPlayback; - else - return 0; + result |= QMediaServiceProviderHint::LowLatencyPlayback; + return result; } }; diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp index 92707169c..6a7725fee 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp @@ -75,10 +75,10 @@ public: QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const { + QMediaServiceProviderHint::Features result; if (service == QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)) - return QMediaServiceProviderHint::StreamPlayback; - else - return 0; + result |= QMediaServiceProviderHint::StreamPlayback; + return result; } }; |