slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fixes' into 'mer-5.6'

Browse Source 
[declarative] Add missing enums to declarative camera MER#1976

See merge request mer-core/qtmultimedia!22
This commit is contained in:
Andrew Branson
2019-05-06 07:38:38 +00:00
parent da7b437606 80f7ecabd3
commit 670941eb52
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rpm/qtmultimedia.spec
View File

@@ -23,7 +23,7 @@ BuildRequires: pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-app-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(libresourceqt5) >= 1.29
BuildRequires: pkgconfig(Qt5QuickTest) BuildRequires: pkgconfig(Qt5QuickTest)
@@ -94,6 +94,7 @@ Summary: Qt Multimedia - GStreamer camerabin video capture media service
Group: Qt/Qt Group: Qt/Qt
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: qt5-qtmultimedia-gsttools = %{version}-%{release} Requires: qt5-qtmultimedia-gsttools = %{version}-%{release}
Requires: gstreamer1.0-droid >= 20181213.0
%description plugin-mediaservice-gstcamerabin %description plugin-mediaservice-gstcamerabin
This package contains the GStreamer camerabin video capture plugin for QtMultimedia This package contains the GStreamer camerabin video capture plugin for QtMultimedia

4
src/imports/multimedia/qdeclarativecameraexposure_p.h
View File

@@ -96,6 +96,10 @@ public:
ExposureParty = QCameraExposure::ExposureParty, ExposureParty = QCameraExposure::ExposureParty,
ExposureCandlelight = QCameraExposure::ExposureCandlelight, ExposureCandlelight = QCameraExposure::ExposureCandlelight,
ExposureBarcode = QCameraExposure::ExposureBarcode, ExposureBarcode = QCameraExposure::ExposureBarcode,
ExposureFlowers = QCameraExposure::ExposureFlowers,
ExposureAR = QCameraExposure::ExposureAR,
ExposureHDR = QCameraExposure::ExposureHDR,
ExposureCloseup = QCameraExposure::ExposureCloseup,
ExposureModeVendor = QCameraExposure::ExposureModeVendor ExposureModeVendor = QCameraExposure::ExposureModeVendor
}; };

4
src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
View File

@@ -76,6 +76,7 @@ public:
WhiteBalanceFluorescent = QCameraImageProcessing::WhiteBalanceFluorescent, WhiteBalanceFluorescent = QCameraImageProcessing::WhiteBalanceFluorescent,
WhiteBalanceFlash = QCameraImageProcessing::WhiteBalanceFlash, WhiteBalanceFlash = QCameraImageProcessing::WhiteBalanceFlash,
WhiteBalanceSunset = QCameraImageProcessing::WhiteBalanceSunset, WhiteBalanceSunset = QCameraImageProcessing::WhiteBalanceSunset,
WhiteBalanceWarmFluorescent = QCameraImageProcessing::WhiteBalanceWarmFluorescent,
WhiteBalanceVendor = QCameraImageProcessing::WhiteBalanceVendor WhiteBalanceVendor = QCameraImageProcessing::WhiteBalanceVendor
}; };
@@ -89,6 +90,9 @@ public:
ColorFilterWhiteboard = QCameraImageProcessing::ColorFilterWhiteboard, ColorFilterWhiteboard = QCameraImageProcessing::ColorFilterWhiteboard,
ColorFilterBlackboard = QCameraImageProcessing::ColorFilterBlackboard, ColorFilterBlackboard = QCameraImageProcessing::ColorFilterBlackboard,
ColorFilterAqua = QCameraImageProcessing::ColorFilterAqua, ColorFilterAqua = QCameraImageProcessing::ColorFilterAqua,
ColorFilterEmboss = QCameraImageProcessing::ColorFilterEmboss,
ColorFilterSketch = QCameraImageProcessing::ColorFilterSketch,
ColorFilterNeon = QCameraImageProcessing::ColorFilterNeon,
ColorFilterVendor = QCameraImageProcessing::ColorFilterVendor ColorFilterVendor = QCameraImageProcessing::ColorFilterVendor
}; };