projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add contextsubscriber-1.0 to PKGCONFIG
[harmattan/cameraplus]
/
declarative
/
declarative.pro
diff --git
a/declarative/declarative.pro
b/declarative/declarative.pro
index
aaaa716
..
d5ae42c
100644
(file)
--- a/
declarative/declarative.pro
+++ b/
declarative/declarative.pro
@@
-3,10
+3,11
@@
TARGET = declarativeqtcamera
DEPENDPATH += . ../lib/
INCLUDEPATH += . ../lib/
DEPENDPATH += . ../lib/
INCLUDEPATH += . ../lib/
-CONFIG += link_pkgconfig
+CONFIG += link_pkgconfig
plugin
-PKGCONFIG = gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-tag-0.10 \
- gstreamer-pbutils-0.10 meego-gstreamer-interfaces-0.10 libcanberra
+PKGCONFIG = gstreamer-pbutils-0.10 libcanberra contextsubscriber-1.0
+
+LIBS += -L../lib/ -lqtcamera
QT += declarative dbus
QT += declarative dbus
@@
-15,7
+16,7
@@
HEADERS += plugin.h previewprovider.h camera.h mode.h imagemode.h videomode.h \
colortone.h exposure.h aperture.h iso.h noisereduction.h \
flickerreduction.h videomute.h metadata.h imagesettings.h \
imageresolutionmodel.h videosettings.h videoresolutionmodel.h \
colortone.h exposure.h aperture.h iso.h noisereduction.h \
flickerreduction.h videomute.h metadata.h imagesettings.h \
imageresolutionmodel.h videosettings.h videoresolutionmodel.h \
- notifications
.h notifications
container.h sounds.h focus.h autofocus.h \
+ notificationscontainer.h sounds.h focus.h autofocus.h \
roi.h
SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp videomode.cpp \
roi.h
SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp videomode.cpp \
@@
-23,5
+24,14
@@
SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp vide
colortone.cpp exposure.cpp aperture.cpp iso.cpp noisereduction.cpp \
flickerreduction.cpp videomute.cpp metadata.cpp imagesettings.cpp \
imageresolutionmodel.cpp videosettings.cpp videoresolutionmodel.cpp \
colortone.cpp exposure.cpp aperture.cpp iso.cpp noisereduction.cpp \
flickerreduction.cpp videomute.cpp metadata.cpp imagesettings.cpp \
imageresolutionmodel.cpp videosettings.cpp videoresolutionmodel.cpp \
- notifications
.cpp notifications
container.cpp sounds.cpp focus.cpp autofocus.cpp \
+ notificationscontainer.cpp sounds.cpp focus.cpp autofocus.cpp \
roi.cpp
roi.cpp
+
+HEADERS += declarativeqtcameranotifications.h
+
+PLUGIN_IMPORT_PATH = QtCamera
+target.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH
+
+qml.files = qmldir
+qml.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH
+INSTALLS += target qml