summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-04-15 13:39:17 +0200
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-04-15 12:34:49 +0000
commit5732a60115ba7c70cfbc53a33d9a26602a2f3f8f (patch)
tree4cfa1a26040bcfaf60ff2b8e0130c9a9d9753717 /src/imports
parent0f9a779f7214f22dfa4625b91dbc3e4d0fc1c122 (diff)
Update plugins.qmltypes
Change-Id: Iaa05756066c8040fe110707eee6b7d71b2a1aa84 Task-number: QTBUG-44300 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/plugins.qmltypes79
1 files changed, 74 insertions, 5 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 1894a2a7d..d01c988ba 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -4,10 +4,15 @@ import QtQuick.tooling 1.1
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtMultimedia 5.4'
+// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
Module {
Component {
+ name: "QAbstractVideoFilter"
+ prototype: "QObject"
+ Property { name: "active"; type: "bool" }
+ }
+ Component {
name: "QCamera"
prototype: "QMediaObject"
Enum {
@@ -326,6 +331,16 @@ Module {
"ExposureBeach": 8,
"ExposureLargeAperture": 9,
"ExposureSmallAperture": 10,
+ "ExposureAction": 11,
+ "ExposureLandscape": 12,
+ "ExposureNightPortrait": 13,
+ "ExposureTheatre": 14,
+ "ExposureSunset": 15,
+ "ExposureSteadyPhoto": 16,
+ "ExposureFireworks": 17,
+ "ExposureParty": 18,
+ "ExposureCandlelight": 19,
+ "ExposureBarcode": 20,
"ExposureModeVendor": 1000
}
}
@@ -484,6 +499,27 @@ Module {
name: "setDigitalZoom"
Parameter { type: "double" }
}
+ Method {
+ name: "supportedViewfinderResolutions"
+ revision: 2
+ type: "QJSValue"
+ Parameter { name: "minimumFrameRate"; type: "double" }
+ Parameter { name: "maximumFrameRate"; type: "double" }
+ }
+ Method {
+ name: "supportedViewfinderResolutions"
+ revision: 2
+ type: "QJSValue"
+ Parameter { name: "minimumFrameRate"; type: "double" }
+ }
+ Method { name: "supportedViewfinderResolutions"; revision: 2; type: "QJSValue" }
+ Method {
+ name: "supportedViewfinderFrameRateRanges"
+ revision: 2
+ type: "QJSValue"
+ Parameter { name: "resolution"; type: "QSize" }
+ }
+ Method { name: "supportedViewfinderFrameRateRanges"; revision: 2; type: "QJSValue" }
}
Component {
name: "QDeclarativeCameraCapture"
@@ -565,6 +601,16 @@ Module {
"ExposureBeach": 8,
"ExposureLargeAperture": 9,
"ExposureSmallAperture": 10,
+ "ExposureAction": 11,
+ "ExposureLandscape": 12,
+ "ExposureNightPortrait": 13,
+ "ExposureTheatre": 14,
+ "ExposureSunset": 15,
+ "ExposureSteadyPhoto": 16,
+ "ExposureFireworks": 17,
+ "ExposureParty": 18,
+ "ExposureCandlelight": 19,
+ "ExposureBarcode": 20,
"ExposureModeVendor": 1000
}
}
@@ -754,9 +800,12 @@ Module {
Component {
name: "QDeclarativeCameraImageProcessing"
prototype: "QObject"
- exports: ["QtMultimedia/CameraImageProcessing 5.0"]
+ exports: [
+ "QtMultimedia/CameraImageProcessing 5.0",
+ "QtMultimedia/CameraImageProcessing 5.5"
+ ]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 1]
Enum {
name: "WhiteBalanceMode"
values: {
@@ -772,12 +821,28 @@ Module {
"WhiteBalanceVendor": 1000
}
}
+ Enum {
+ name: "ColorFilter"
+ values: {
+ "ColorFilterNone": 0,
+ "ColorFilterGrayscale": 1,
+ "ColorFilterNegative": 2,
+ "ColorFilterSolarize": 3,
+ "ColorFilterSepia": 4,
+ "ColorFilterPosterize": 5,
+ "ColorFilterWhiteboard": 6,
+ "ColorFilterBlackboard": 7,
+ "ColorFilterAqua": 8,
+ "ColorFilterVendor": 1000
+ }
+ }
Property { name: "whiteBalanceMode"; type: "WhiteBalanceMode" }
Property { name: "manualWhiteBalance"; type: "double" }
Property { name: "contrast"; type: "double" }
Property { name: "saturation"; type: "double" }
Property { name: "sharpeningLevel"; type: "double" }
Property { name: "denoisingLevel"; type: "double" }
+ Property { name: "colorFilter"; revision: 1; type: "ColorFilter" }
Signal {
name: "whiteBalanceModeChanged"
Parameter { type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" }
@@ -826,6 +891,10 @@ Module {
name: "setDenoisingLevel"
Parameter { name: "value"; type: "double" }
}
+ Method {
+ name: "setColorFilter"
+ Parameter { name: "colorFilter"; type: "ColorFilter" }
+ }
}
Component {
name: "QDeclarativeCameraRecorder"
@@ -888,7 +957,7 @@ Module {
Property { name: "actualLocation"; type: "string"; isReadonly: true }
Property { name: "muted"; type: "bool" }
Property { name: "errorString"; type: "string"; isReadonly: true }
- Property { name: "errorCode"; type: "string"; isReadonly: true }
+ Property { name: "errorCode"; type: "Error"; isReadonly: true }
Signal {
name: "recorderStateChanged"
Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" }
@@ -1444,7 +1513,7 @@ Module {
Property { name: "autoOrientation"; revision: 2; type: "bool" }
Property { name: "sourceRect"; type: "QRectF"; isReadonly: true }
Property { name: "contentRect"; type: "QRectF"; isReadonly: true }
- Property { name: "filters"; isList: true; isReadonly: true }
+ Property { name: "filters"; type: "QAbstractVideoFilter"; isList: true; isReadonly: true }
Signal {
name: "fillModeChanged"
Parameter { type: "QDeclarativeVideoOutput::FillMode" }