Merge branch 'friendlist' into integration

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index e72cb3d..f421788 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,6 +23,8 @@ SOURCES += main.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 \
@@ -46,6 +48,8 @@ HEADERS += ui/mainwindow.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 \
@@ -72,8 +76,7 @@ QT += network \
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)
 }
-
-maemo5 {
+maemo5 { 
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)