Call parent class componentComplete()

[harmattan/cameraplus] / declarative / declarative.pro

diff --git a/declarative/declarative.pro b/declarative/declarative.pro
index 47bd976..e1fe398 100644 (file)
--- a/declarative/declarative.pro
+++ b/declarative/declarative.pro
@@ -6,11 +6,14 @@ include(../cameraplus.pri)
 
 CONFIG += link_pkgconfig plugin
 
-PKGCONFIG = gstreamer-pbutils-0.10 libcanberra contextsubscriber-1.0
+PKGCONFIG = gstreamer-pbutils-0.10 libcanberra
 
 LIBS += -L../lib/ -lqtcamera
 
-QT += declarative dbus
+QT += dbus
+
+qt4:QT += declarative
+qt5:QT += qml quick
 
 HEADERS += plugin.h previewprovider.h camera.h mode.h imagemode.h videomode.h \
            zoom.h flash.h scene.h evcomp.h videotorch.h whitebalance.h \
@@ -18,7 +21,7 @@ HEADERS += plugin.h previewprovider.h camera.h mode.h imagemode.h videomode.h \
            flickerreduction.h videomute.h metadata.h imagesettings.h \
            imageresolutionmodel.h videosettings.h videoresolutionmodel.h \
            notificationscontainer.h sounds.h focus.h autofocus.h \
-           roi.h cameraconfig.h videoplayer.h
+           roi.h cameraconfig.h videoplayer.h viewfinder.h
 
 SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp videomode.cpp \
            zoom.cpp flash.cpp scene.cpp evcomp.cpp videotorch.cpp whitebalance.cpp \
@@ -26,9 +29,7 @@ SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp vide
            flickerreduction.cpp videomute.cpp metadata.cpp imagesettings.cpp \
            imageresolutionmodel.cpp videosettings.cpp videoresolutionmodel.cpp \
            notificationscontainer.cpp sounds.cpp focus.cpp autofocus.cpp \
-           roi.cpp cameraconfig.cpp videoplayer.cpp
-
-HEADERS += declarativeqtcameranotifications.h
+           roi.cpp cameraconfig.cpp videoplayer.cpp viewfinder.cpp
 
 PLUGIN_IMPORT_PATH = QtCamera
 target.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH