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 f08a969..18c8712 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -32,13 +32,13 @@ SOURCES += main.cpp \
     ui/friendlistview.cpp \
     ui/friendlistitem.cpp \
     user/user.cpp \
-    ui/buttonitem.cpp \
-    ui/situareuser.cpp \
+    ui/avatarimage.cpp \
     engine/engine.cpp \
     ui/settingsdialog.cpp \
     map/maptilerequest.cpp \
     ui/friendlistpanel.cpp \
-    ui/userpanel.cpp
+    ui/userpanel.cpp \
+    ui/imagebutton.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -67,23 +67,24 @@ HEADERS += ui/mainwindow.h \
     ui/friendlistview.h \
     ui/friendlistitem.h \
     user/user.h \
-    ui/buttonitem.h \
-    ui/situareuser.h \
+    ui/avatarimage.h \
     engine/engine.h \
     ui/settingsdialog.h \
     map/maptilerequest.h \
     ui/friendlistpanel.h \
-    ui/userpanel.h
+    ui/userpanel.h \
+    ui/panelcommon.h \
+    ui/imagebutton.h
 QT += network \
     webkit
+#DEFINES += QT_NO_DEBUG_OUTPUT
 
-# DEFINES += QT_NO_DEBUG_OUTPUT
 !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)