Unify harmattan detection and move harmattan specific bits to a harmattan scope

diff --git a/cameraplus.pri b/cameraplus.pri
new file mode 100644 (file)
index 0000000..b6ede31
--- /dev/null
+++ b/cameraplus.pri
@@ -0,0 +1,5 @@
+contains(MEEGO_EDITION, "harmattan") {
+    message("Building for harmattan")
+    DEFINES += HARMATTAN
+    CONFIG += harmattan
+}

diff --git a/cameraplus.pro b/cameraplus.pro
index e00e15d..b2daac6 100644 (file)
--- a/cameraplus.pro
+++ b/cameraplus.pro
@@ -1,3 +1,5 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS = lib declarative src
+
+include(cameraplus.pri)

diff --git a/declarative/declarative.pro b/declarative/declarative.pro
index 06a0a9e..47bd976 100644 (file)
--- a/declarative/declarative.pro
+++ b/declarative/declarative.pro
@@ -2,6 +2,7 @@ TEMPLATE = lib
 TARGET = declarativeqtcamera
 DEPENDPATH += . ../lib/
 INCLUDEPATH += . ../lib/
+include(../cameraplus.pri)
 
 CONFIG += link_pkgconfig plugin
 

diff --git a/lib/lib.pro b/lib/lib.pro
index 0ebf783..9b3beba 100644 (file)
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -3,12 +3,16 @@ TARGET = qtcamera
 DEPENDPATH += .
 INCLUDEPATH += .
 
+include(../cameraplus.pri)
+
 QT += opengl
 
 CONFIG += link_pkgconfig
 
 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
+            gstreamer-pbutils-0.10
+
+harmattan:PKGCONFIG += meego-gstreamer-interfaces-0.10
 
 HEADERS += qtcamconfig.h qtcamera.h qtcamscanner.h qtcamdevice.h qtcamviewfinder.h \
            qtcammode.h qtcamgstreamermessagehandler.h qtcamgstreamermessagelistener.h \
@@ -40,10 +44,8 @@ LIBS += -lgstphotography-0.10
 HEADERS += gst/gstcopy.h
 SOURCES += gst/gstcopy.cpp
 
-isEqual(MEEGO_EDITION, harmattan) {
-SOURCES += qtcamviewfinderrenderermeego.cpp
-HEADERS += qtcamviewfinderrenderermeego.h
-}
+harmattan:SOURCES += qtcamviewfinderrenderermeego.cpp
+harmattan:HEADERS += qtcamviewfinderrenderermeego.h
 
 target.path = /usr/lib/
 INSTALLS += target

diff --git a/src/src.pro b/src/src.pro
index e082679..8178d7d 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET = cameraplus
 DEPENDPATH += . ../
 INCLUDEPATH += . ../
+include(../cameraplus.pri)
 
 QT += declarative opengl dbus
 
@@ -31,11 +32,7 @@ contains(CONFIG, qmljsdebug) {
     include(../qmljsdebugger/qmljsdebugger-src.pri)
 }
 
-contains(MEEGO_EDITION, "harmattan") {
-    message("Building for harmattan")
-    DEFINES += HARMATTAN
-    RESOURCES += ../qml/harmattan/harmattan.qrc
-}
+harmattan:RESOURCES += ../qml/harmattan/harmattan.qrc
 
 target.path = /usr/bin/
 INSTALLS += target