Merge branch 'master' into stacked_friends

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 10c60d8..40c31fb 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -36,7 +36,9 @@ SOURCES += main.cpp \
     engine/engine.cpp \
     ui/settingsdialog.cpp \
     map/maptilerequest.cpp \
-    ui/imagebutton.cpp
+    ui/imagebutton.cpp \
+    map/friendgroupitem.cpp \
+    map/frienditemshandler.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -69,10 +71,12 @@ HEADERS += ui/mainwindow.h \
     engine/engine.h \
     ui/settingsdialog.h \
     map/maptilerequest.h \
-    ui/imagebutton.h
+    ui/imagebutton.h \
+    map/friendgroupitem.h \
+    map/frienditemshandler.h
 QT += network \
     webkit
-#DEFINES += QT_NO_DEBUG_OUTPUT
+DEFINES += QT_NO_DEBUG_OUTPUT
 
 !maemo5 { 
     message(QJson built in)