X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=declarative%2Fcameraconfig.cpp;h=1c1678a6dd014d3dcefb0fc9e042b812f7252647;hb=b431d72c5b827805cf1e9b0d94869501fde01c52;hp=b247d62dd6ab6c948bdfe43700e2d508c60785c0;hpb=cfd928f873feadc44b25b2988eb34794e106a421;p=harmattan%2Fcameraplus

diff --git a/declarative/cameraconfig.cpp b/declarative/cameraconfig.cpp
index b247d62..1c1678a 100644
--- a/declarative/cameraconfig.cpp
+++ b/declarative/cameraconfig.cpp
@@ -22,7 +22,11 @@
 
 #include "cameraconfig.h"
 #include "qtcamconfig.h"
+#if defined(QT4)
 #include <QDeclarativeInfo>
+#elif defined(QT5)
+#include <QQmlInfo>
+#endif
 
 CameraConfig::CameraConfig(QObject *parent) :
   QObject(parent),
@@ -59,6 +63,10 @@ void CameraConfig::classBegin() {
 }
 
 void CameraConfig::componentComplete() {
+  if (m_config) {
+    return;
+  }
+
   if (m_path.isEmpty()) {
     m_config = new QtCamConfig(this);
   }