diff options
author | Tim Blechmann <tim@klingt.org> | 2024-03-25 19:21:50 +0800 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-27 06:35:31 +0000 |
commit | ecc2e847af59d14df540d69a77ba6ecbe10598db (patch) | |
tree | 7a3a5c9e7ccf9bf456b8d9481e285c715aa87886 | |
parent | 6087e267f244428c7078d8699935d3daece89861 (diff) |
Plugins - don't export internal classes
Plugins are MODULEs not SHARED libraries in cmake terminology and thus
cannot be linked, but instead their intention is to be just loaded
dynamically. Therefore we remove all `Q_MULTIMEDIA_EXPORT` statements on
function definitions which are not the plugin entry points.
Pick-to: 6.5
Change-Id: Ibc246b51a8183d42444cd956254e4452a014046f
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit c016e3e8b3364d0f7d152efbe55fc8e66717a156)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 07a2cbf0172bac068ec64d2bbf7a46e6209c5406)
14 files changed, 23 insertions, 26 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h b/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h index 79cc3cfa9..3033f5ff9 100644 --- a/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h +++ b/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h @@ -51,7 +51,7 @@ struct V4L2CameraInfo QVideoFrameFormat::PixelFormat formatForV4L2Format(uint32_t v4l2Format); uint32_t v4l2FormatForPixelFormat(QVideoFrameFormat::PixelFormat format); -class Q_MULTIMEDIA_EXPORT QV4L2Camera : public QPlatformCamera +class QV4L2Camera : public QPlatformCamera { Q_OBJECT diff --git a/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h b/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h index 8d5d2b0c1..34702813e 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE class QNetworkReply; -class Q_MULTIMEDIA_EXPORT QGstAppSrc : public QObject +class QGstAppSrc : public QObject { Q_OBJECT public: diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h index f88d14419..7bbdfe6d7 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE class QAudioDevice; -class Q_MULTIMEDIA_EXPORT QGstreamerAudioInput : public QObject, public QPlatformAudioInput +class QGstreamerAudioInput : public QObject, public QPlatformAudioInput { public: static QMaybe<QPlatformAudioInput *> create(QAudioInput *parent); diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h index 2a936c63b..edeb221f0 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE class QAudioDevice; -class Q_MULTIMEDIA_EXPORT QGstreamerAudioOutput : public QObject, public QPlatformAudioOutput +class QGstreamerAudioOutput : public QObject, public QPlatformAudioOutput { public: static QMaybe<QPlatformAudioOutput *> create(QAudioOutput *parent); diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h index 83604c5d1..71996a0cc 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE -class Q_MULTIMEDIA_EXPORT QGstreamerBufferProbe +class QGstreamerBufferProbe { public: enum Flags diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h index 99000c689..8fe6a9132 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h @@ -35,11 +35,10 @@ class QGstAppSrc; class QGstreamerAudioOutput; class QGstreamerVideoOutput; -class Q_MULTIMEDIA_EXPORT QGstreamerMediaPlayer - : public QObject, - public QPlatformMediaPlayer, - public QGstreamerBusMessageFilter, - public QGstreamerSyncMessageFilter +class QGstreamerMediaPlayer : public QObject, + public QPlatformMediaPlayer, + public QGstreamerBusMessageFilter, + public QGstreamerSyncMessageFilter { Q_OBJECT diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h index 2fac6ba89..99c508fee 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h @@ -30,7 +30,7 @@ struct QGstPointerImpl::QGstRefcountingAdaptor<GstMessage> static void unref(GstMessage *arg) noexcept { gst_message_unref(arg); } }; -class Q_MULTIMEDIA_EXPORT QGstreamerMessage : public QGstPointerImpl::QGstObjectWrapper<GstMessage> +class QGstreamerMessage : public QGstPointerImpl::QGstObjectWrapper<GstMessage> { using BaseClass = QGstPointerImpl::QGstObjectWrapper<GstMessage>; diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h index b9ffa6036..9a94181aa 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE class QVideoSink; -class Q_MULTIMEDIA_EXPORT QGstreamerVideoOutput : public QObject +class QGstreamerVideoOutput : public QObject { Q_OBJECT diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h index fe0ba8157..5c69186c7 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h @@ -23,10 +23,9 @@ QT_BEGIN_NAMESPACE class QGstreamerVideoSink; -class Q_MULTIMEDIA_EXPORT QGstreamerVideoOverlay - : public QObject - , public QGstreamerSyncMessageFilter - , private QGstreamerBufferProbe +class QGstreamerVideoOverlay : public QObject, + public QGstreamerSyncMessageFilter, + private QGstreamerBufferProbe { Q_OBJECT public: diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h index 0f27d2351..31b640603 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h @@ -31,8 +31,7 @@ QT_BEGIN_NAMESPACE class QGstreamerVideoRenderer; class QVideoWindow; -class Q_MULTIMEDIA_EXPORT QGstreamerVideoSink - : public QPlatformVideoSink +class QGstreamerVideoSink : public QPlatformVideoSink { Q_OBJECT public: diff --git a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h index cd0f9d3ca..3f8fd65fb 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE class QGstreamerVideoSink; -class Q_MULTIMEDIA_EXPORT QGstSubtitleSink +class QGstSubtitleSink { public: GstBaseSink parent; diff --git a/src/plugins/multimedia/gstreamer/common/qgstutils_p.h b/src/plugins/multimedia/gstreamer/common/qgstutils_p.h index 7ba97a97d..a157409e8 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstutils_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstutils_p.h @@ -35,14 +35,14 @@ class QImage; class QVideoFrameFormat; namespace QGstUtils { - Q_MULTIMEDIA_EXPORT QAudioFormat audioFormatForSample(GstSample *sample); - QAudioFormat audioFormatForCaps(const QGstCaps &caps); - Q_MULTIMEDIA_EXPORT QGstCaps capsForAudioFormat(const QAudioFormat &format); +QAudioFormat audioFormatForSample(GstSample *sample); +QAudioFormat audioFormatForCaps(const QGstCaps &caps); +QGstCaps capsForAudioFormat(const QAudioFormat &format); - void setFrameTimeStamps(QVideoFrame *frame, GstBuffer *buffer); +void setFrameTimeStamps(QVideoFrame *frame, GstBuffer *buffer); } -Q_MULTIMEDIA_EXPORT GList *qt_gst_video_sinks(); +GList *qt_gst_video_sinks(); QT_END_NAMESPACE diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h index 3f4ced8a7..af616866d 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h @@ -27,7 +27,7 @@ class QVideoFrameFormat; class QGstreamerVideoSink; class QOpenGLContext; -class Q_MULTIMEDIA_EXPORT QGstVideoBuffer final : public QAbstractVideoBuffer +class QGstVideoBuffer final : public QAbstractVideoBuffer { public: diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h index 9c70d0441..4f07e9f15 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h @@ -89,7 +89,7 @@ private: QGstCaps::MemoryFormat memoryFormat = QGstCaps::CpuMemory; }; -class Q_MULTIMEDIA_EXPORT QGstVideoRendererSink +class QGstVideoRendererSink { public: GstVideoSink parent; |