diff options
author | Jochen Seemann <seemann.jochen@gmail.com> | 2016-08-22 23:19:14 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-31 08:51:05 +0000 |
commit | 2d1c728c4c4522d0e405da514b6ce1a3580239f5 (patch) | |
tree | ec67a88eb57c1e40f37d34a65e4fcfc44cc12609 /src/imports/multimedia/multimedia.cpp | |
parent | 338078153449374e07d33c312ef1a9d093acf279 (diff) |
adding property CameraCapture::supportedResolutions
This change adds the new property supportedResolutions to expose the
same functionality to QML as QCameraImageCapture::supportedResolutions
provides for C++. Exposing as QML property allows us to easily display
the resolutions in list-based elements like ListView.
Task-number: QTBUG-45289
Change-Id: Ica7206ec1daa36298a761d659d1c0b05d13562ec
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 872b2ae61..d249747b7 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -140,6 +140,10 @@ public: qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 2>(uri, 5, 7, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera")); + // 5.9 types + qmlRegisterUncreatableType<QDeclarativeCameraCapture, 1>(uri, 5, 9, "CameraCapture", + trUtf8("CameraCapture is provided by Camera")); + qmlRegisterType<QDeclarativeMediaMetaData>(); qmlRegisterType<QAbstractVideoFilter>(); } |