From 49cde1b2c4cdc44d1efd5f2d34b58d6a4fda56c8 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Tue, 22 Jul 2014 15:44:54 +0200
Subject: [PATCH] Add missing registration of CameraViewfinder QML type.
Change-Id: If4eedd6298731953a3f86c86f0e61b850ee263aa
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
---
src/imports/multimedia/multimedia.cpp | 3 +++
1 file changed, 3 insertions(+)
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>();
}
--
GitLab