Reworking QtCamViewfinderRenderer to avoid having to pass QPainter to the renderer

[harmattan/cameraplus] / declarative / declarative.pro

diff --git a/declarative/declarative.pro b/declarative/declarative.pro
index e4d8d3c..e1fe398 100644 (file)
--- a/declarative/declarative.pro
+++ b/declarative/declarative.pro
@@ -2,14 +2,18 @@ TEMPLATE = lib
 TARGET = declarativeqtcamera
 DEPENDPATH += . ../lib/
 INCLUDEPATH += . ../lib/
+include(../cameraplus.pri)
 
-CONFIG += link_pkgconfig
+CONFIG += link_pkgconfig plugin
 
 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 \
@@ -17,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
+           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 \
@@ -25,6 +29,11 @@ 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
+           roi.cpp cameraconfig.cpp videoplayer.cpp viewfinder.cpp
+
+PLUGIN_IMPORT_PATH = QtCamera
+target.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH
 
-HEADERS += declarativeqtcameranotifications.h
+qml.files = qmldir
+qml.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH
+INSTALLS += target qml