Merge branch 'new_panels' into locationlistview

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index c5e3962..bb9d204 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -45,11 +45,21 @@ SOURCES += main.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/avatarimage.cpp \
+    ui/extendedlistitem.cpp \
+    ui/extendedlistitemdelegate.cpp \
+    ui/extendedlistitemstore.cpp \
     ui/friendlistitem.cpp \
+    ui/friendlistitemdelegate.cpp \
     ui/friendlistpanel.cpp \
+    ui/friendlistview.cpp \
     ui/fullscreenbutton.cpp \
     ui/imagebutton.cpp \
     ui/indicatorbutton.cpp \
+    ui/listitem.cpp \
+    ui/listitemdelegate.cpp \
+    ui/listview.cpp \
+    ui/locationlistitem.cpp \
+    ui/locationlistview.cpp \
     ui/indicatorbuttonpanel.cpp \
     ui/logindialog.cpp \
     ui/mainwindow.cpp \
@@ -59,10 +69,6 @@ SOURCES += main.cpp \
     ui/userinfopanel.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
-    ui/listview.cpp \
-    ui/listitem.cpp \
-    ui/listitemdelegate.cpp \
-    ui/friendlistitemdelegate.cpp \
     ui/searchdialog.cpp \
     ui/panelbase.cpp \    
     ui/panelbar.cpp \
@@ -70,6 +76,9 @@ SOURCES += main.cpp \
     ui/paneltab.cpp \
     ui/paneltabbar.cpp \
     ui/tabbedpanel.cpp \
+    ui/routingpanel.cpp \
+    ui/routewaypointlistitem.cpp \
+    ui/routewaypointlistview.cpp \
     user/user.cpp
 HEADERS += application.h \
     common.h \
@@ -118,11 +127,13 @@ HEADERS += application.h \
     ui/friendlistitem.h \
     ui/friendlistitemdelegate.h \
     ui/friendlistpanel.h \
+    ui/friendlistview.h \
     ui/fullscreenbutton.h \
     ui/imagebutton.h \
     ui/indicatorbutton.h \
     ui/indicatorbuttonpanel.h \
     ui/logindialog.h \
+    ui/locationlistview.h \
     ui/mainwindow.h \
     ui/mapscale.h \
     ui/settingsdialog.h \
@@ -142,6 +153,9 @@ HEADERS += application.h \
     ui/paneltab.h \
     ui/paneltabbar.h \
     ui/tabbedpanel.h \
+    ui/routingpanel.h \
+    ui/routewaypointlistitem.h \
+    ui/routewaypointlistview.h \
     user/user.h
 QT += network \
     webkit