Merge branch 'master' into situare_interact

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index a9850c1..2a7997c 100644 (file)
--- 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
@@ -16,7 +15,6 @@ SOURCES += main.cpp \
     engine/engine.cpp \
     engine/mce.cpp \
     facebookservice/facebookauthentication.cpp \
-    facebookservice/facebookcredentials.cpp \
     gps/gpsposition.cpp \
     map/baselocationitem.cpp \
     map/friendgroupitem.cpp \
@@ -63,7 +61,6 @@ SOURCES += main.cpp \
     ui/locationlistview.cpp \
     ui/indicatorbuttonpanel.cpp \
     ui/locationsearchpanel.cpp \
-    ui/logindialog.cpp \
     ui/mainwindow.cpp \
     ui/mapscale.cpp \
     ui/panelbar.cpp \
@@ -98,7 +95,8 @@ SOURCES += main.cpp \
     ui/personlistitem.cpp \
     ui/personlistview.cpp \
     ui/messagedialog.cpp \
-    ui/tagcompletion.cpp
+    ui/tagcompletion.cpp \
+    engine/updatelocation.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
@@ -108,8 +106,6 @@ HEADERS += application.h \
     engine/mce.h \
     error.h \
     facebookservice/facebookauthentication.h \
-    facebookservice/facebookcommon.h \
-    facebookservice/facebookcredentials.h \
     gps/gpscommon.h \
     gps/gpsposition.h \
     map/baselocationitem.h \
@@ -159,7 +155,6 @@ HEADERS += application.h \
     ui/listview.h \
     ui/listitem.h \
     ui/listitemdelegate.h \
-    ui/logindialog.h \
     ui/locationlistitem.h \
     ui/locationlistview.h \
     ui/locationsearchpanel.h \
@@ -198,7 +193,8 @@ HEADERS += application.h \
     ui/personlistitem.h \
     ui/personlistview.h \
     ui/messagedialog.h \
-    ui/tagcompletion.h
+    ui/tagcompletion.h \
+    engine/updatelocation.h
 QT += network \
     webkit \
     sql
@@ -206,12 +202,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
-    SOURCES += engine/contactmanagerprivatestub.cpp
-    HEADERS += engine/contactmanagerprivatestub.h
-    QT += maemo5
+               gps/gpspositionprivate.h \
+               engine/contactmanagerprivatestub.h \
+               engine/mceprivatestub.h
     CONFIG += mobility
     MOBILITY += location
 } else:maemo5 {