From: Janne Kiiski <janne.kiiski@ixonos.com>
Date: Fri, 5 Nov 2010 14:27:57 +0000 (+0200)
Subject: Fixed projects to build in Simulator
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=fbf91de91faec80e90fd76bea235b6e958abcd3d

Fixed projects to build in Simulator
---

diff --git a/src/application.cpp b/src/application.cpp
index 51b2efe..e781092 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -55,6 +55,7 @@ void Application::unregisterWindow(WId window)
     m_windows.removeOne(window);
 }
 
+#ifdef Q_WS_X11
 WId Application::activeDesktopWindow(Display *display, WId rootWindow)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -117,3 +118,4 @@ bool Application::x11EventFilter(XEvent *event)
     // don't block any events here, so false is returned
     return false;
 }
+#endif
diff --git a/src/application.h b/src/application.h
index 0a75f46..e2774a9 100644
--- a/src/application.h
+++ b/src/application.h
@@ -61,6 +61,7 @@ public:
     void unregisterWindow(WId wId);
 
 private:
+#ifdef Q_WS_X11
     /**
     * @brief Return active window
     *
@@ -70,6 +71,7 @@ private:
     */
     WId activeDesktopWindow(Display *display, WId rootWindow);
 
+
     /**
     * @brief Event filter for window
     *
@@ -78,6 +80,7 @@ private:
     *         Return false for normal event dispatching
     */
     bool x11EventFilter(XEvent *event);
+#endif
 
 /*******************************************************************************
  * SIGNALS
diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 12f46e3..4b5d300 100644
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -21,7 +21,7 @@
    USA.
 */
 
-#include "parser.h"
+#include <qjson/parser.h>
 
 #include <QtDebug>
 #include <QDateTime>
diff --git a/src/gps/gpspositionprivate.cpp b/src/gps/gpspositionprivate.cpp
index 502c76e..7243771 100644
--- a/src/gps/gpspositionprivate.cpp
+++ b/src/gps/gpspositionprivate.cpp
@@ -152,7 +152,7 @@ void GPSPositionPrivate::positionUpdated(const QGeoPositionInfo &positionInfo)
 
     const QGeoCoordinate &coordinate = positionInfo.coordinate();
 
-    if (coordinate().isValid()) {
+    if (coordinate.isValid()) {
         emit m_parent->position(GeoCoordinate(coordinate.latitude(), coordinate.longitude()),
                                 accuracy(positionInfo));
     }
diff --git a/src/routing/geocodingservice.cpp b/src/routing/geocodingservice.cpp
index 165bc7b..411ef54 100644
--- a/src/routing/geocodingservice.cpp
+++ b/src/routing/geocodingservice.cpp
@@ -20,7 +20,7 @@
     USA.
 */
 
-#include "parser.h"
+#include <qjson/parser.h>
 
 #include "coordinates/geocoordinate.h"
 #include "../error.h"
diff --git a/src/routing/routingservice.cpp b/src/routing/routingservice.cpp
index 1da2b8a..7ef20d6 100644
--- a/src/routing/routingservice.cpp
+++ b/src/routing/routingservice.cpp
@@ -20,7 +20,7 @@
    USA.
 */
 
-#include "parser.h"
+#include <qjson/parser.h>
 
 #include <QCryptographicHash>
 #include <QDebug>
diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 12b56eb..ed789ad 100644
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -19,7 +19,7 @@
    USA.
 */
 
-#include "parser.h"
+#include <qjson/parser.h>
 
 #include <QtAlgorithms>
 #include <QDebug>
diff --git a/src/src.pro b/src/src.pro
index 8cc801c..a678492 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,7 +3,6 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-INCLUDEPATH += /usr/include/qjson
 LIBS += -lqjson
 RESOURCES += ../images.qrc \
     ../languages.qrc
@@ -181,10 +180,13 @@ DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
     SOURCES += network/networkhandlerprivatestub.cpp \
-               gps/gpspositionprivate.cpp
+               gps/gpspositionprivate.cpp \
+               engine/contactmanagerprivatestub.cpp \
+               engine/mceprivatestub.cpp
     HEADERS += network/networkhandlerprivatestub.h \
-               gps/gpspositionprivate.h
-    QT += maemo5
+               gps/gpspositionprivate.h \
+               engine/contactmanagerprivatestub.h \
+               engine/mceprivatestub.h
     CONFIG += mobility
     MOBILITY += location
 } else:maemo5 {
diff --git a/tests/map/mapengine/mapengine.pro b/tests/map/mapengine/mapengine.pro
index aae36e9..5e78e35 100644
--- a/tests/map/mapengine/mapengine.pro
+++ b/tests/map/mapengine/mapengine.pro
@@ -56,7 +56,7 @@ HEADERS += ../../../src/map/mapengine.h \
     ../../../src/map/maprouteitem.h
 DEFINES += QT_NO_DEBUG_OUTPUT
 
-maemo5 | simulator {
+maemo5 {
     INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
     SOURCES += ../../../src/network/networkhandlerprivate.cpp
     HEADERS += ../../../src/network/networkhandlerprivate.h