Merge branch 'master' into login_browser

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 8cc801c..1fcb5b7 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 \
@@ -86,7 +84,8 @@ SOURCES += main.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
     user/user.cpp \
-    ui/listitemcontextbuttonbar.cpp
+    ui/listitemcontextbuttonbar.cpp \
+    ui/facebookloginbrowser.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
@@ -97,7 +96,6 @@ HEADERS += application.h \
     error.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
-    facebookservice/facebookcredentials.h \
     gps/gpscommon.h \
     gps/gpsposition.h \
     map/baselocationitem.h \
@@ -174,17 +172,21 @@ HEADERS += application.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
-    ui/listitemcontextbuttonbar.h
+    ui/listitemcontextbuttonbar.h \
+    ui/facebookloginbrowser.h
 QT += network \
     webkit
 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 {