Modified src.pro to include networkhandlerprivatestub when building in

scratchbox.

diff --git a/src/gps/gpspositionprivate.cpp b/src/gps/gpspositionprivate.cpp
index b54f3b0..341ffa8 100644 (file)
--- a/src/gps/gpspositionprivate.cpp
+++ b/src/gps/gpspositionprivate.cpp
@@ -154,15 +154,7 @@ qreal GPSPositionPrivate::accuracy(const QGeoPositionInfo &positionInfo)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QDateTime timestamp;
-
-#ifdef Q_WS_MAEMO_5
-    timestamp = positionInfo.dateTime();
-#else
-    timestamp = positionInfo.timestamp();
-#endif
-
-    if (!timestamp.isValid())
+    if (!positionInfo.timestamp().isValid())
         return GPS_ACCURACY_UNDEFINED;
 
     if (positionInfo.hasAttribute(QGeoPositionInfo::HorizontalAccuracy))

diff --git a/src/network/networkhandler.cpp b/src/network/networkhandler.cpp
index 5b83c8d..bdac189 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(Q_WS_SIMULATOR)
+#if (defined(Q_WS_MAEMO_5) | defined(Q_WS_SIMULATOR)) & !defined(SBOX)
 #include "networkhandlerprivate.h"
 #else
 #include "networkhandlerprivatestub.h"

diff --git a/src/network/networkhandlerprivate.cpp b/src/network/networkhandlerprivate.cpp
index 3763de7..3d3b63a 100644 (file)
--- a/src/network/networkhandlerprivate.cpp
+++ b/src/network/networkhandlerprivate.cpp
@@ -35,7 +35,7 @@ NetworkHandlerPrivate::NetworkHandlerPrivate(QObject *parent)
       m_connected(false),
       m_connecting(false)
 {
-    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     m_parent = static_cast<NetworkHandler*>(parent);
 
@@ -51,7 +51,7 @@ NetworkHandlerPrivate::NetworkHandlerPrivate(QObject *parent)
 
 void NetworkHandlerPrivate::stateChanged(const QDBusMessage &message)
 {
-    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     if (message.arguments().count() > CONNECTION_STATE_INDEX) {
 
@@ -72,14 +72,13 @@ void NetworkHandlerPrivate::stateChanged(const QDBusMessage &message)
                 m_connecting = false;
                 emit m_parent->connected();
             }
-            qWarning() << __PRETTY_FUNCTION__ << m_connected;
         }
     }
 }
 
 void NetworkHandlerPrivate::connect()
 {
-    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     if (!m_connecting && !m_connected) {
         m_connecting = true;
@@ -90,7 +89,7 @@ void NetworkHandlerPrivate::connect()
 
 void NetworkHandlerPrivate::disconnect()
 {
-    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     dBusInterface->call(ICD_DBUS_API_DISCONNECT_REQ,
                         QVariant((unsigned int)ICD_CONNECTION_FLAG_USER_EVENT));
@@ -98,14 +97,14 @@ void NetworkHandlerPrivate::disconnect()
 
 bool NetworkHandlerPrivate::isConnected()
 {
-    qWarning() << __PRETTY_FUNCTION__ << m_connected;
+    qDebug() << __PRETTY_FUNCTION__ << m_connected;
 
     return m_connected;
 }
 
 void NetworkHandlerPrivate::state()
 {
-    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     dBusInterface->call(ICD_DBUS_API_STATE_REQ);
 }

diff --git a/src/src.pro b/src/src.pro
index a5ce065..9a47db6 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -97,13 +97,21 @@ QT += network \
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 maemo5 | simulator {
-    INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
-    SOURCES += gps/gpspositionprivate.cpp \
-               network/networkhandlerprivate.cpp
-    HEADERS += gps/gpspositionprivate.h \
-               network/networkhandlerprivate.h
-    QT += maemo5 dbus
-    CONFIG += mobility icd2
+    sbox {
+        DEFINES += SBOX
+        SOURCES += network/networkhandlerprivatestub.cpp
+        HEADERS += network/networkhandlerprivatestub.h
+    } else {
+        INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+        SOURCES += network/networkhandlerprivate.cpp
+        HEADERS += network/networkhandlerprivate.h
+        QT += dbus
+        CONFIG += icd2
+    }
+    SOURCES += gps/gpspositionprivate.cpp
+    HEADERS += gps/gpspositionprivate.h
+    QT += maemo5
+    CONFIG += mobility
     MOBILITY = location
     message([QJson])
     message(Make sure you have QJson development headers installed)