DeviceInfo and GeoCode are now harmattan specific

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

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

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

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

diff --git a/src/harmattan/harmattan.pri b/src/harmattan/harmattan.pri
index 57a9b11..03f9fb5 100644 (file)
--- a/src/harmattan/harmattan.pri
+++ b/src/harmattan/harmattan.pri
@@ -1,7 +1,7 @@
 DEPENDPATH += harmattan .
 INCLUDEPATH += harmattan .
 
-PKGCONFIG += quill contextsubscriber-1.0
+PKGCONFIG += quill contextsubscriber-1.0 QtLocation QtSystemInfo
 
-HEADERS += quillitem.h soundvolumecontrol.h
-SOURCES += quillitem.cpp soundvolumecontrol.cpp
+HEADERS += quillitem.h soundvolumecontrol.h deviceinfo.h geocode.h
+SOURCES += quillitem.cpp soundvolumecontrol.cpp deviceinfo.cpp geocode.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 982a1b7..0e09e34 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,8 @@
 #include "filenaming.h"
 #ifdef HARMATTAN
 #include "quillitem.h"
+#include "geocode.h"
+#include "deviceinfo.h"
 #endif
 #include "soundvolumecontrol.h"
 #include "displaystate.h"
@@ -41,9 +43,6 @@
 #include "cameraresources.h"
 #include "compass.h"
 #include "orientation.h"
-#if defined(QT4) // TODO:
-#include "geocode.h"
-#endif
 #include "mountprotector.h"
 #include "trackerstore.h"
 #include "focusrectangle.h"
@@ -53,7 +52,6 @@
 #include "postcapturemodel.h"
 #include "batteryinfo.h"
 #include "gridlines.h"
-#include "deviceinfo.h"
 #include "devicekeys.h"
 #include "platformsettings.h"
 #include "dbusservice.h"
@@ -114,6 +112,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<FileNaming>("CameraPlus", 1, 0, "FileNaming");
 #ifdef HARMATTAN
   qmlRegisterType<QuillItem>("CameraPlus", 1, 0, "QuillItem");
+  qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
+  qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
 #endif
   qmlRegisterType<SoundVolumeControl>("CameraPlus", 1, 0, "SoundVolumeControl");
   qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
@@ -121,9 +121,6 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");
   qmlRegisterType<Compass>("CameraPlus", 1, 0, "Compass");
   qmlRegisterType<Orientation>("CameraPlus", 1, 0, "Orientation");
-#if defined(QT4) // TODO:
-  qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
-#endif
   qmlRegisterType<MountProtector>("CameraPlus", 1, 0, "MountProtector");
   qmlRegisterType<TrackerStore>("CameraPlus", 1, 0, "TrackerStore");
   qmlRegisterType<FocusRectangle>("CameraPlus", 1, 0, "FocusRectangle");
@@ -133,9 +130,6 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<PostCaptureModel>("CameraPlus", 1, 0, "PostCaptureModel");
   qmlRegisterType<BatteryInfo>("CameraPlus", 1, 0, "BatteryInfo");
   qmlRegisterType<GridLines>("CameraPlus", 1, 0, "GridLines");
-#if defined(QT4) // TODO:
-  qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
-#endif
   qmlRegisterType<DeviceKeys>("CameraPlus", 1, 0, "DeviceKeys");
   qmlRegisterType<PlatformSettings>("CameraPlus", 1, 0, "PlatformSettings");
 

diff --git a/src/src.pro b/src/src.pro
index bb0b0dc..76bd49e 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,8 +9,6 @@ CONFIG += link_pkgconfig
 
 qt4 {
     QT += declarative opengl
-    CONFIG += mobility
-    MOBILITY += location systeminfo
     PKGCONFIG += QtSparql qmsystem2 libresourceqt1 qdeclarative-boostable
 }
 
@@ -50,9 +48,8 @@ nemo {
 }
 
 qt4 {
-# TODO: geocode.*
-    SOURCES += qmlfileengine.cpp geocode.cpp deviceinfo.cpp
-    HEADERS += qmlfileengine.h geocode.h deviceinfo.h
+    SOURCES += qmlfileengine.cpp
+    HEADERS += qmlfileengine.h
 }
 
 target.path = /usr/bin/