diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
| commit | 34d15785600f98faa4a51827b452d6c488e4c10c (patch) | |
| tree | e4dd1b11602f0b13bedd895df254a69fa9187fc0 /src/plugins/gstreamer | |
| parent | 46b10ce610cfa3957ed4be719b9a7f3f1f39dcf0 (diff) | |
| parent | 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
Diffstat (limited to 'src/plugins/gstreamer')
5 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp index 4b0e7afa4..e9a7a5332 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp @@ -48,7 +48,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <unistd.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h b/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h index a6cdc5297..7051913a7 100644 --- a/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h +++ b/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h @@ -52,7 +52,7 @@ class CameraBinSession; QT_USE_NAMESPACE -class Q_MULTIMEDIA_EXPORT CameraBinCaptureBufferFormat : public QCameraCaptureBufferFormatControl +class CameraBinCaptureBufferFormat : public QCameraCaptureBufferFormatControl { Q_OBJECT public: diff --git a/src/plugins/gstreamer/camerabin/camerabincapturedestination.h b/src/plugins/gstreamer/camerabin/camerabincapturedestination.h index 460fd1aa3..bc24a23d8 100644 --- a/src/plugins/gstreamer/camerabin/camerabincapturedestination.h +++ b/src/plugins/gstreamer/camerabin/camerabincapturedestination.h @@ -49,7 +49,7 @@ class CameraBinSession; QT_USE_NAMESPACE -class Q_MULTIMEDIA_EXPORT CameraBinCaptureDestination : public QCameraCaptureDestinationControl +class CameraBinCaptureDestination : public QCameraCaptureDestinationControl { Q_OBJECT public: diff --git a/src/plugins/gstreamer/camerabin/camerabinexposure.h b/src/plugins/gstreamer/camerabin/camerabinexposure.h index c30da25ad..db16bed24 100644 --- a/src/plugins/gstreamer/camerabin/camerabinexposure.h +++ b/src/plugins/gstreamer/camerabin/camerabinexposure.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class CameraBinSession; -class Q_MULTIMEDIA_EXPORT CameraBinExposure : public QCameraExposureControl +class CameraBinExposure : public QCameraExposureControl { Q_OBJECT diff --git a/src/plugins/gstreamer/camerabin/camerabinflash.h b/src/plugins/gstreamer/camerabin/camerabinflash.h index 84177f122..0efd100a7 100644 --- a/src/plugins/gstreamer/camerabin/camerabinflash.h +++ b/src/plugins/gstreamer/camerabin/camerabinflash.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class CameraBinSession; -class Q_MULTIMEDIA_EXPORT CameraBinFlash : public QCameraFlashControl +class CameraBinFlash : public QCameraFlashControl { Q_OBJECT public: |