Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index aae03c1..18c8712 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,18 +23,22 @@ 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 \
     ui/updatelocation/texteditautoresizer.cpp \
     ui/friendlistview.cpp \
-    ui/friendlistitemdelegate.cpp \
     ui/friendlistitem.cpp \
-    engine/engine.cpp \
     user/user.cpp \
-    ui/buttonitem.cpp \
-    ui/situareuser.cpp \
-    ui/settingsdialog.cpp
+    ui/avatarimage.cpp \
+    engine/engine.cpp \
+    ui/settingsdialog.cpp \
+    map/maptilerequest.cpp \
+    ui/friendlistpanel.cpp \
+    ui/userpanel.cpp \
+    ui/imagebutton.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -47,6 +51,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 \
@@ -59,24 +65,26 @@ HEADERS += ui/mainwindow.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
     ui/friendlistview.h \
-    ui/friendlistitemdelegate.h \
     ui/friendlistitem.h \
-    engine/engine.h \
     user/user.h \
-    ui/buttonitem.h \
-    ui/situareuser.h \
-    ui/settingsdialog.h
+    ui/avatarimage.h \
+    engine/engine.h \
+    ui/settingsdialog.h \
+    map/maptilerequest.h \
+    ui/friendlistpanel.h \
+    ui/userpanel.h \
+    ui/panelcommon.h \
+    ui/imagebutton.h
 QT += network \
     webkit
+#DEFINES += QT_NO_DEBUG_OUTPUT
 
-# use don't use OpenGL when building in scratchbox
 !maemo5 { 
     message(QJson built in)
     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)
@@ -109,4 +117,3 @@ unix {
     target.path = $$BINDIR
     INSTALLS += target
 }
-RESOURCES +=