Merge branch 'master' into situare_interact

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index a678492..2a7997c 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 \
@@ -62,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 \
@@ -85,7 +83,20 @@ SOURCES += main.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
     user/user.cpp \
-    ui/listitemcontextbuttonbar.cpp
+    ui/listitemcontextbuttonbar.cpp \
+    ui/meetpeoplepanel.cpp \
+    situareservice/database.cpp \
+    ui/tagsdialog.cpp \
+    ui/messagelistview.cpp \
+    ui/messagelistitem.cpp \
+    ui/headerlistitemdelegate.cpp \
+    ui/messagepanel.cpp \
+    situareservice/message.cpp \
+    ui/personlistitem.cpp \
+    ui/personlistview.cpp \
+    ui/messagedialog.cpp \
+    ui/tagcompletion.cpp \
+    engine/updatelocation.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
@@ -95,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 \
@@ -146,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 \
@@ -173,9 +181,23 @@ HEADERS += application.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
-    ui/listitemcontextbuttonbar.h
+    ui/listitemcontextbuttonbar.h \
+    ui/meetpeoplepanel.h \
+    situareservice/database.h \
+    ui/tagsdialog.h \
+    ui/messagelistview.h \
+    ui/messagelistitem.h \
+    ui/headerlistitemdelegate.h \
+    ui/messagepanel.h \
+    situareservice/message.h \
+    ui/personlistitem.h \
+    ui/personlistview.h \
+    ui/messagedialog.h \
+    ui/tagcompletion.h \
+    engine/updatelocation.h
 QT += network \
-    webkit
+    webkit \
+    sql
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {