diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-12-12 12:00:06 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-13 13:34:41 +0100 |
| commit | fe21ee675e72f7cb3936db6aa01862cfd322ce50 (patch) | |
| tree | 8d2caa1d13b79cff554a7fbb8b98051c0695d683 /src/imports/multimedia/multimedia.cpp | |
| parent | c31d8cddd0a2e1f1ee622bc9ea07d038191ceea2 (diff) | |
New camera viewfinder settings API.
There already was a control interface for the viewfinder settings
but no real public C++ API and a partial QML API.
This patch adds a new C++ API and improves the QML API.
Supported viewfinder settings are resolution, minimumFrameRate,
maximumFrameRate and pixelFormat. The camera can be queried for
the supported values for each of these settings.
A new control interface was created to match the new API.
Change-Id: I289fea038fe46277a5516c956a64280da09ed985
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 01b037a79..8b2287ce4 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -105,6 +105,7 @@ public: // 5.5 types qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera")); + qmlRegisterRevision<QDeclarativeCamera, 2>(uri, 5, 5); qmlRegisterType<QDeclarativeMediaMetaData>(); } |