diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-07-22 15:44:54 +0200 |
|---|---|---|
| committer | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2014-07-25 06:33:44 +0200 |
| commit | 49cde1b2c4cdc44d1efd5f2d34b58d6a4fda56c8 (patch) | |
| tree | 6f278a86055f1217f47e30667c6628f27701c774 /src/imports | |
| parent | 86d5c7e4dc7258c3fea26f34b2076a52e292e81c (diff) | |
| download | qtmultimedia-49cde1b2c4cdc44d1efd5f2d34b58d6a4fda56c8.tar.gz | |
Add missing registration of CameraViewfinder QML type.
Change-Id: If4eedd6298731953a3f86c86f0e61b850ee263aa
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 99d6ba422..2e4b0bce3 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -58,6 +58,7 @@ #include "qdeclarativecameraflash_p.h" #include "qdeclarativecamerafocus_p.h" #include "qdeclarativecameraimageprocessing_p.h" +#include "qdeclarativecameraviewfinder_p.h" #include "qdeclarativetorch_p.h" QML_DECLARE_TYPE(QSoundEffect) @@ -107,6 +108,8 @@ public: // 5.4 types qmlRegisterSingletonType(uri, 5, 4, "QtMultimedia", QDeclarativeMultimedia::initGlobalObject); qmlRegisterRevision<QDeclarativeCamera, 1>(uri, 5, 4); + qmlRegisterUncreatableType<QDeclarativeCameraViewfinder>(uri, 5, 4, "CameraViewfinder", + trUtf8("CameraViewfinder is provided by Camera")); qmlRegisterType<QDeclarativeMediaMetaData>(); } |