Merge branch 'master' into login_browser

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index a678492..1fcb5b7 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -15,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 \
@@ -85,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 \
@@ -96,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 \
@@ -173,7 +172,8 @@ 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