diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:56:59 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:57:05 +0200 |
| commit | d5babf5976fcf86af6cbbf2c5e354767d1f4c612 (patch) | |
| tree | a3594868bba2619613b09e14be5b66063ec4f188 /src/multimedia/playback | |
| parent | 18e6110dfdfd62cc0032f8e43586d075f15299f0 (diff) | |
| parent | 22b2e53d00cfdb9ee7400fc4c55aa021a9166e0c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/multimedia/playback')
6 files changed, 7 insertions, 8 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 3f24d0f55..3156081e7 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -276,7 +276,6 @@ void QMediaNetworkPlaylistProvider::shuffle() } -#include "moc_qmedianetworkplaylistprovider_p.cpp" - QT_END_NAMESPACE +#include "moc_qmedianetworkplaylistprovider_p.cpp" diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 5723a77dd..cfb4af63a 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -1646,6 +1646,6 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const QAbstractVideoSurface \l {setVideoOutput()}{output}. */ -#include "moc_qmediaplayer.cpp" QT_END_NAMESPACE +#include "moc_qmediaplayer.cpp" diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 7618827da..7c21a599b 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -818,7 +818,7 @@ void QMediaPlaylist::setCurrentIndex(int playlistPosition) \value AccessDeniedError Access denied error. */ -#include "moc_qmediaplaylist.cpp" -#include "moc_qmediaplaylist_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylist.cpp" +#include "moc_qmediaplaylist_p.cpp" diff --git a/src/multimedia/playback/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp index a0f0e8321..957c7c79d 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin.cpp +++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp @@ -183,6 +183,6 @@ QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin() If the device is invalid or the format is unsupported this will return a null pointer. */ -#include "moc_qmediaplaylistioplugin_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylistioplugin_p.cpp" diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp index 120f621f5..9b25f968a 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator.cpp +++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp @@ -539,6 +539,6 @@ void QMediaPlaylistNavigatorPrivate::_q_mediaChanged(int start, int end) Signals that media immediately surrounding the current position has changed. */ -#include "moc_qmediaplaylistnavigator_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylistnavigator_p.cpp" diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp index f441052c1..b146fb7b3 100644 --- a/src/multimedia/playback/qmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qmediaplaylistprovider.cpp @@ -316,6 +316,6 @@ void QMediaPlaylistProvider::shuffle() Signals that a load failed() due to an \a error. The \a errorMessage provides more information. */ -#include "moc_qmediaplaylistprovider_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylistprovider_p.cpp" |