Use liblocation GPS only when built with CONFIG+=armel in Scratchbox
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 8 Jun 2010 11:08:42 +0000 (14:08 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 8 Jun 2010 11:08:42 +0000 (14:08 +0300)
src/src.pro

index 10e7c8a..e560eb4 100644 (file)
@@ -116,20 +116,24 @@ simulator {
         HEADERS += network/networkhandlerprivate.h
         QT += dbus
         CONFIG += icd2
+        SOURCES += gps/gpspositionprivateliblocation.cpp \
+                   gps/liblocationwrapper.cpp \
+                   gps/geopositioninfo.cpp \
+                   gps/geocoordinate.cpp
+        HEADERS += gps/gpspositionprivateliblocation.h \
+                   gps/liblocationwrapper.h \
+                   gps/geopositioninfo.h \
+                   gps/geocoordinate.h
+        CONFIG += link_pkgconfig
     } else {
-        SOURCES += network/networkhandlerprivatestub.cpp
-        HEADERS += network/networkhandlerprivatestub.h
+        SOURCES += gps/gpspositionprivatestub.cpp \
+                   network/networkhandlerprivatestub.cpp
+        HEADERS += gps/gpspositionprivatestub.h \
+                   network/networkhandlerprivatestub.h
     }
-    SOURCES += gps/gpspositionprivateliblocation.cpp \
-               gps/liblocationwrapper.cpp \
-               gps/geopositioninfo.cpp \
-               gps/geocoordinate.cpp
-    HEADERS += gps/gpspositionprivateliblocation.h \
-               gps/liblocationwrapper.h \
-               gps/geopositioninfo.h \
-               gps/geocoordinate.h
+
     QT += maemo5
-    CONFIG += link_pkgconfig
+
     PKGCONFIG += glib-2.0 liblocation
     message([QJson])
     message(Make sure you have QJson development headers installed)
@@ -160,7 +164,7 @@ unix {
     DATADIR = $$PREFIX/share
     DEFINES += DATADIR=\\\"$$DATADIR\\\" \
         PKGDATADIR=\\\"$$PKGDATADIR\\\"
-    
+
     # MAKE INSTALL
     desktop.path = $$DATADIR/applications/hildon
     desktop.files += situare.desktop