Preliminary merge. Integration is brancehd from fresh master.

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 78b2559..253e529 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -20,12 +20,19 @@ SOURCES += main.cpp \
     map/mapscene.cpp \
     map/maptile.cpp \
     map/mapfetcher.cpp \
+    map/mapzoompanel.cpp \
+    map/mapbutton.cpp \
+    map/ownlocationitem.cpp \
+    map/baselocationitem.cpp \
+    map/friendlocationitem.cpp \
     ui/pixmap.cpp \
     ui/infotab.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
-    engine/engine.cpp \
     user/user.cpp \
+    ui/buttonitem.cpp \
+    ui/situareuser.cpp \
+    engine/engine.cpp \
     ui/settingsdialog.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
@@ -36,6 +43,11 @@ HEADERS += ui/mainwindow.h \
     map/maptile.h \
     map/mapfetcher.h \
     map/mapcommon.h \
+    map/mapzoompanel.h \
+    map/mapbutton.h \
+    map/ownlocationitem.h \
+    map/baselocationitem.h \
+    map/friendlocationitem.h \
     ui/pixmap.h \
     ui/infotab.h \
     ui/updatelocation/updatelocationdialog.h \
@@ -47,6 +59,8 @@ HEADERS += ui/mainwindow.h \
     facebookservice/facebookcredentials.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
+    ui/buttonitem.h \
+    ui/situareuser.h \
     engine/engine.h \
     user/user.h \
     ui/settingsdialog.h