diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-14 13:17:28 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-15 09:16:56 +0000 |
commit | b680d6079a065210c42e324e06500bc5d1cdad23 (patch) | |
tree | 0d86aed4a7a6984b2b999cbc30417e1de779d034 /src | |
parent | 47edca19681309ef79aebb20e9226384cf2c046b (diff) |
Include moc_*.cpp files in QtMM android plugin
The reason for the refactoring is following the common approach
that leads to reducing compilation time and binary size.
- logic hasn't been touched
- the same refactorings of main QtMM code, tests, examples,
other plugins are coming in the next commits
Task-number: QTBUG-103290
Change-Id: Ic564cb560271b75c8ffe871244e4c3a5a3a5ef93
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit f77f5a2b8ec84d68ba0e793dba36476462bc460b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
15 files changed, 28 insertions, 0 deletions
diff --git a/src/plugins/multimedia/android/audio/qandroidaudiodecoder.cpp b/src/plugins/multimedia/android/audio/qandroidaudiodecoder.cpp index 9deb3afd9..c69a44989 100644 --- a/src/plugins/multimedia/android/audio/qandroidaudiodecoder.cpp +++ b/src/plugins/multimedia/android/audio/qandroidaudiodecoder.cpp @@ -427,3 +427,5 @@ void QAndroidAudioDecoder::readDevice() { } QT_END_NAMESPACE + +#include "moc_qandroidaudiodecoder_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidaudioinput.cpp b/src/plugins/multimedia/android/common/qandroidaudioinput.cpp index 6001fb700..a1eb9258b 100644 --- a/src/plugins/multimedia/android/common/qandroidaudioinput.cpp +++ b/src/plugins/multimedia/android/common/qandroidaudioinput.cpp @@ -43,3 +43,5 @@ bool QAndroidAudioInput::isMuted() const } QT_END_NAMESPACE + +#include "moc_qandroidaudioinput_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp index 535915b38..e5b212283 100644 --- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp @@ -393,3 +393,4 @@ void QAndroidTextureVideoOutput::newFrame(const QVideoFrame &frame) QT_END_NAMESPACE #include "qandroidvideooutput.moc" +#include "moc_qandroidvideooutput_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidvideosink.cpp b/src/plugins/multimedia/android/common/qandroidvideosink.cpp index 9979902db..878e5884d 100644 --- a/src/plugins/multimedia/android/common/qandroidvideosink.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideosink.cpp @@ -32,3 +32,5 @@ void QAndroidVideoSink::setRhi(QRhi *rhi) } QT_END_NAMESPACE + +#include "moc_qandroidvideosink_p.cpp" diff --git a/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp b/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp index 240e90ddf..cd4ff6843 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp @@ -552,3 +552,5 @@ void QAndroidCamera::setWhiteBalanceMode(QCamera::WhiteBalanceMode mode) } QT_END_NAMESPACE + +#include "moc_qandroidcamera_p.cpp" diff --git a/src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp b/src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp index 06cd4c072..fa756b610 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp @@ -778,3 +778,5 @@ void QAndroidCameraSession::setVideoSink(QVideoSink *sink) } QT_END_NAMESPACE + +#include "moc_qandroidcamerasession_p.cpp" diff --git a/src/plugins/multimedia/android/mediacapture/qandroidcapturesession.cpp b/src/plugins/multimedia/android/mediacapture/qandroidcapturesession.cpp index c7df3c001..afee45e2f 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidcapturesession.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidcapturesession.cpp @@ -477,3 +477,5 @@ void QAndroidCaptureSession::onInfo(int what, int extra) } QT_END_NAMESPACE + +#include "moc_qandroidcapturesession_p.cpp" diff --git a/src/plugins/multimedia/android/mediacapture/qandroidimagecapture.cpp b/src/plugins/multimedia/android/mediacapture/qandroidimagecapture.cpp index d949218a8..4105851ed 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidimagecapture.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidimagecapture.cpp @@ -69,3 +69,5 @@ void QAndroidImageCapture::setCaptureSession(QPlatformMediaCaptureSession *sessi this, &QAndroidImageCapture::error); } QT_END_NAMESPACE + +#include "moc_qandroidimagecapture_p.cpp" diff --git a/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp b/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp index 9155657d3..0a1fde54f 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp @@ -113,3 +113,5 @@ void QAndroidMediaCaptureSession::setVideoPreview(QVideoSink *sink) } QT_END_NAMESPACE + +#include "moc_qandroidmediacapturesession_p.cpp" diff --git a/src/plugins/multimedia/android/mediaplayer/qandroidmediaplayer.cpp b/src/plugins/multimedia/android/mediaplayer/qandroidmediaplayer.cpp index 645e5a742..436e6df64 100644 --- a/src/plugins/multimedia/android/mediaplayer/qandroidmediaplayer.cpp +++ b/src/plugins/multimedia/android/mediaplayer/qandroidmediaplayer.cpp @@ -983,3 +983,5 @@ void QAndroidMediaPlayer::updateTrackInfo() } QT_END_NAMESPACE + +#include "moc_qandroidmediaplayer_p.cpp" diff --git a/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp b/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp index 7606b6b06..20d05c4c5 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp @@ -1780,3 +1780,4 @@ bool AndroidCamera::registerNativeMethods() QT_END_NAMESPACE #include "androidcamera.moc" +#include "moc_androidcamera_p.cpp" diff --git a/src/plugins/multimedia/android/wrappers/jni/androidmediaplayer.cpp b/src/plugins/multimedia/android/wrappers/jni/androidmediaplayer.cpp index 58a546710..51e0aa46f 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidmediaplayer.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidmediaplayer.cpp @@ -517,3 +517,5 @@ bool AndroidMediaPlayer::registerNativeMethods() } QT_END_NAMESPACE + +#include "moc_androidmediaplayer_p.cpp" diff --git a/src/plugins/multimedia/android/wrappers/jni/androidmediarecorder.cpp b/src/plugins/multimedia/android/wrappers/jni/androidmediarecorder.cpp index 5c39d5ab5..9b2815e70 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidmediarecorder.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidmediarecorder.cpp @@ -333,3 +333,5 @@ bool AndroidMediaRecorder::registerNativeMethods() } QT_END_NAMESPACE + +#include "moc_androidmediarecorder_p.cpp" diff --git a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp index 257063283..53da2ffd8 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp @@ -145,3 +145,5 @@ void AndroidSurfaceTexture::setOnFrameAvailableListener(const QJniObject &listen } QT_END_NAMESPACE + +#include "moc_androidsurfacetexture_p.cpp" diff --git a/src/plugins/multimedia/android/wrappers/jni/androidsurfaceview.cpp b/src/plugins/multimedia/android/wrappers/jni/androidsurfaceview.cpp index 2bba49f23..2e868c374 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidsurfaceview.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidsurfaceview.cpp @@ -148,3 +148,5 @@ void AndroidSurfaceView::setGeometry(int x, int y, int width, int height) } QT_END_NAMESPACE + +#include "moc_androidsurfaceview_p.cpp" |