From 80f7ecabd342a4852d668c80901af36f8496b0e5 Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 2 Apr 2019 20:36:24 +0100 Subject: [PATCH] [declarative] Add missing enums to declarative camera MER#1976 --- rpm/qtmultimedia.spec | 3 ++- src/imports/multimedia/qdeclarativecameraexposure_p.h | 4 ++++ src/imports/multimedia/qdeclarativecameraimageprocessing_p.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rpm/qtmultimedia.spec b/rpm/qtmultimedia.spec index 8b8f2556..85a0d4be 100644 --- a/rpm/qtmultimedia.spec +++ b/rpm/qtmultimedia.spec @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(gstreamer-audio-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) >= 1.14.1+git3.1 BuildRequires: pkgconfig(libresourceqt5) >= 1.29 BuildRequires: pkgconfig(Qt5QuickTest) @@ -86,6 +86,7 @@ Summary: Qt Multimedia - GStreamer camerabin video capture media service Group: Qt/Qt Requires: %{name} = %{version}-%{release} Requires: qt5-qtmultimedia-gsttools = %{version}-%{release} +Requires: gstreamer1.0-droid >= 20181213.0 %description plugin-mediaservice-gstcamerabin This package contains the GStreamer camerabin video capture plugin for QtMultimedia diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h index d61931ee..00c41468 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure_p.h +++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h @@ -96,6 +96,10 @@ public: ExposureParty = QCameraExposure::ExposureParty, ExposureCandlelight = QCameraExposure::ExposureCandlelight, ExposureBarcode = QCameraExposure::ExposureBarcode, + ExposureFlowers = QCameraExposure::ExposureFlowers, + ExposureAR = QCameraExposure::ExposureAR, + ExposureHDR = QCameraExposure::ExposureHDR, + ExposureCloseup = QCameraExposure::ExposureCloseup, ExposureModeVendor = QCameraExposure::ExposureModeVendor }; diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h index 0e0cbb23..d3fbd0cd 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h @@ -76,6 +76,7 @@ public: WhiteBalanceFluorescent = QCameraImageProcessing::WhiteBalanceFluorescent, WhiteBalanceFlash = QCameraImageProcessing::WhiteBalanceFlash, WhiteBalanceSunset = QCameraImageProcessing::WhiteBalanceSunset, + WhiteBalanceWarmFluorescent = QCameraImageProcessing::WhiteBalanceWarmFluorescent, WhiteBalanceVendor = QCameraImageProcessing::WhiteBalanceVendor }; @@ -89,6 +90,9 @@ public: ColorFilterWhiteboard = QCameraImageProcessing::ColorFilterWhiteboard, ColorFilterBlackboard = QCameraImageProcessing::ColorFilterBlackboard, ColorFilterAqua = QCameraImageProcessing::ColorFilterAqua, + ColorFilterEmboss = QCameraImageProcessing::ColorFilterEmboss, + ColorFilterSketch = QCameraImageProcessing::ColorFilterSketch, + ColorFilterNeon = QCameraImageProcessing::ColorFilterNeon, ColorFilterVendor = QCameraImageProcessing::ColorFilterVendor };