Move quillitem.* to src/harmattan and register it only if we are building for harmattan

diff --git a/src/harmattan/harmattan.pri b/src/harmattan/harmattan.pri
new file mode 100644 (file)
index 0000000..3d0f4bc
--- /dev/null
+++ b/src/harmattan/harmattan.pri
@@ -0,0 +1,7 @@
+DEPENDPATH += harmattan .
+INCLUDEPATH += harmattan .
+
+PKGCONFIG += quill
+
+HEADERS += quillitem.h
+SOURCES += quillitem.cpp

diff --git a/src/quillitem.cpp b/src/harmattan/quillitem.cpp
similarity index 100%
rename from src/quillitem.cpp
rename to src/harmattan/quillitem.cpp

diff --git a/src/quillitem.h b/src/harmattan/quillitem.h
similarity index 100%
rename from src/quillitem.h
rename to src/harmattan/quillitem.h

diff --git a/src/main.cpp b/src/main.cpp
index 7f9758b..fd6cd8c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,7 +27,9 @@
 
 #include "settings.h"
 #include "filenaming.h"
+#ifdef HARMATTAN
 #include "quillitem.h"
+#endif
 #include "displaystate.h"
 #include "fsmonitor.h"
 #include "cameraresources.h"
@@ -86,7 +88,9 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
 
   qmlRegisterType<Settings>("CameraPlus", 1, 0, "Settings");
   qmlRegisterType<FileNaming>("CameraPlus", 1, 0, "FileNaming");
+#ifdef HARMATTAN
   qmlRegisterType<QuillItem>("CameraPlus", 1, 0, "QuillItem");
+#endif
   qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
   qmlRegisterType<FSMonitor>("CameraPlus", 1, 0, "FSMonitor");
   qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");

diff --git a/src/src.pro b/src/src.pro
index 8178d7d..09d86ff 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,15 +10,15 @@ CONFIG += link_pkgconfig mobility qtsparql
 
 MOBILITY += location systeminfo
 
-PKGCONFIG = quill qmsystem2 libresourceqt1
+PKGCONFIG = qmsystem2 libresourceqt1
 
-SOURCES += main.cpp settings.cpp filenaming.cpp quillitem.cpp displaystate.cpp fsmonitor.cpp \
+SOURCES += main.cpp settings.cpp filenaming.cpp displaystate.cpp fsmonitor.cpp \
            cameraresources.cpp compass.cpp orientation.cpp geocode.cpp mountprotector.cpp \
            trackerstore.cpp focusrectangle.cpp sharehelper.cpp deletehelper.cpp galleryhelper.cpp \
            postcapturemodel.cpp batteryinfo.cpp gridlines.cpp deviceinfo.cpp devicekeys.cpp \
            platformsettings.cpp dbusservice.cpp qmlfileengine.cpp
 
-HEADERS += settings.h filenaming.h quillitem.h displaystate.h fsmonitor.h \
+HEADERS += settings.h filenaming.h displaystate.h fsmonitor.h \
            cameraresources.h compass.h orientation.h geocode.h mountprotector.h \
            trackerstore.h focusrectangle.h sharehelper.h deletehelper.h galleryhelper.h \
            postcapturemodel.h batteryinfo.h gridlines.h deviceinfo.h devicekeys.h \
@@ -32,7 +32,10 @@ contains(CONFIG, qmljsdebug) {
     include(../qmljsdebugger/qmljsdebugger-src.pri)
 }
 
-harmattan:RESOURCES += ../qml/harmattan/harmattan.qrc
+harmattan {
+    include(harmattan/harmattan.pri)
+    RESOURCES += ../qml/harmattan/harmattan.qrc
+}
 
 target.path = /usr/bin/
 INSTALLS += target