From: Rodrigo Linfati <rodrigo@linfati.cl>
Date: Fri, 1 Jan 2010 16:15:06 +0000 (+0100)
Subject: re-check compile on qtcreator, maemo5, maemo4
X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=commitdiff_plain;h=7a362f733b50387b00d6325ec02a235229e1e546;hp=189b6505f9453649b3c12a61928aa344d9a9bc5b

re-check compile on qtcreator, maemo5, maemo4
---

diff --git a/src/gps.h b/src/gps.h
index 42d8841..3f9dde0 100644
--- a/src/gps.h
+++ b/src/gps.h
@@ -1,13 +1,14 @@
 #ifndef GPS_H
 #define GPS_H
 
+#include <QObject>
+
 #ifdef Q_WS_MAEMO_5
 
 extern "C" {
 #include <location/location-gps-device.h>
 #include <location/location-gpsd-control.h>
 }
-#include <QObject>
 
 class GpsMaemo5 : public QObject {
     Q_OBJECT
@@ -45,8 +46,5 @@ private:
 
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 
-#else
-#include "gpsfake.h"
 #endif
-
 #endif // GPS_H
diff --git a/src/gpsfake.h b/src/gpsfake.h
index 7db29f8..34daf33 100644
--- a/src/gpsfake.h
+++ b/src/gpsfake.h
@@ -3,6 +3,8 @@
 
 #include <QObject>
 
+#ifndef Q_WS_MAEMO_5
+
 class GpsMaemo5 : public QObject {
     Q_OBJECT
 
@@ -33,4 +35,5 @@ private:
     double accuracy;
 };
 
+#endif
 #endif // GPSFAKE_H
diff --git a/src/latitude.h b/src/latitude.h
index c986d30..a8aac20 100644
--- a/src/latitude.h
+++ b/src/latitude.h
@@ -5,6 +5,7 @@
 #include <QtWebKit>
 #include "glatitude.h"
 #include "gps.h"
+#include "gpsfake.h"
 
 class LatitudeGUI : public QMainWindow {
     Q_OBJECT
diff --git a/src/src.pro b/src/src.pro
index ade050a..53ac347 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,8 +11,9 @@ SOURCES += main.cpp \
     gps.cpp
 HEADERS += latitude.h \
     glatitude.h \
-    gps.h \
-    gpsfake.h
+    gps.h
+HEADERS += gpsfake.h
+
 unix { 
     isEmpty(PREFIX):PREFIX = /usr/local
     BINDIR = $$PREFIX/bin