Merge branch 'master' of https://vcs.maemo.org/git/situare

diff --git a/debian/rules b/debian/rules
index c84fb9f..0ac85a7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@ APPNAME := situare
 builddir:
        mkdir -p builddir
 builddir/Makefile: builddir
-       cd builddir && qmake PREFIX=/usr ../src/src.pro
+       cd builddir && qmake CONFIG+=armel PREFIX=/usr ../src/src.pro
 build: build-stamp
 
 build-stamp: builddir/Makefile 

diff --git a/src/gps/gpsposition.cpp b/src/gps/gpsposition.cpp
index 95a8f6d..7c2f78c 100644 (file)
--- a/src/gps/gpsposition.cpp
+++ b/src/gps/gpsposition.cpp
@@ -24,9 +24,9 @@
 #include "gpsposition.h"
 
 #if defined(Q_WS_MAEMO_5) | defined(Q_WS_SIMULATOR)
-#include "gps/gpspositionprivate.h"
+#include "gpspositionprivate.h"
 #else
-#include "gps/gpspositionprivatestub.h"
+#include "gpspositionprivatestub.h"
 #endif
 
 GPSPosition::GPSPosition(QObject *parent)

diff --git a/src/network/networkhandler.cpp b/src/network/networkhandler.cpp
index 76eb1d4..e41b871 100644 (file)
--- a/src/network/networkhandler.cpp
+++ b/src/network/networkhandler.cpp
@@ -23,7 +23,7 @@
 
 #include "networkhandler.h"
 
-#if defined(Q_WS_MAEMO_5) & !defined(SBOX)
+#if defined(Q_WS_MAEMO_5) & defined(ARMEL)
 #include "networkhandlerprivate.h"
 #else
 #include "networkhandlerprivatestub.h"

diff --git a/src/src.pro b/src/src.pro
index 3890c1f..53abef3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -98,17 +98,18 @@ QT += network \
 #DEFINES += QT_NO_DEBUG_OUTPUT
 
 maemo5 | simulator {
-    sbox | simulator {
-        DEFINES += SBOX
-        SOURCES += network/networkhandlerprivatestub.cpp
-        HEADERS += network/networkhandlerprivatestub.h
-    } else {
+    armel {
+        DEFINES += ARMEL
         INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
         SOURCES += network/networkhandlerprivate.cpp
         HEADERS += network/networkhandlerprivate.h
         QT += dbus
         CONFIG += icd2
     }
+    else {
+        SOURCES += network/networkhandlerprivatestub.cpp
+        HEADERS += network/networkhandlerprivatestub.h
+    }
     SOURCES += gps/gpspositionprivate.cpp
     HEADERS += gps/gpspositionprivate.h
     QT += maemo5