Merge branch 'master' into contact_dialog

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 2d87d0b..6c35bb4 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -12,6 +12,7 @@ SOURCES += main.cpp \
     application.cpp \
     coordinates/geocoordinate.cpp \
     coordinates/scenecoordinate.cpp \
+    engine/contactmanager.cpp \
     engine/engine.cpp \
     engine/mce.cpp \
     facebookservice/facebookauthentication.cpp \
@@ -61,29 +62,35 @@ SOURCES += main.cpp \
     ui/locationlistitem.cpp \
     ui/locationlistview.cpp \
     ui/indicatorbuttonpanel.cpp \
+    ui/locationsearchpanel.cpp \
     ui/logindialog.cpp \
     ui/mainwindow.cpp \
     ui/mapscale.cpp \
-    ui/settingsdialog.cpp \
-    ui/userinfo.cpp \
-    ui/userinfopanel.cpp \
-    ui/zoombutton.cpp \
-    ui/zoombuttonpanel.cpp \
-    ui/searchdialog.cpp \
     ui/panelbar.cpp \
+    ui/panelbase.cpp \
     ui/panelcontentstack.cpp \
+    ui/panelcontextbuttonbar.cpp \
     ui/paneltab.cpp \
     ui/paneltabbar.cpp \
-    ui/tabbedpanel.cpp \
     ui/routingpanel.cpp \
     ui/routewaypointlistitem.cpp \
-    ui/routewaypointlistview.cpp \
-    user/user.cpp \
-    engine/contactmanager.cpp
+    ui/routewaypointlistview.cpp \    
+    ui/searchdialog.cpp \
+    ui/searchhistorylistitem.cpp \
+    ui/searchhistorylistview.cpp \
+    ui/settingsdialog.cpp \
+    ui/tabbedpanel.cpp \
+    ui/textmodifier.cpp \
+    ui/userinfo.cpp \
+    ui/userinfopanel.cpp \
+    ui/zoombutton.cpp \
+    ui/zoombuttonpanel.cpp \
+    user/user.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
     coordinates/scenecoordinate.h \
+    engine/contactmanager.h \
     engine/engine.h \
     engine/mce.h \
     error.h \
@@ -124,6 +131,9 @@ HEADERS += application.h \
     ui/updatelocation/texteditautoresizer.h \
     ui/updatelocation/updatelocationdialog.h \
     ui/avatarimage.h \
+    ui/extendedlistitem.h \
+    ui/extendedlistitemdelegate.h \
+    ui/extendedlistitemstore.h \
     ui/friendlistitem.h \
     ui/friendlistitemdelegate.h \
     ui/friendlistpanel.h \
@@ -132,34 +142,39 @@ HEADERS += application.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 \
-    ui/userinfo.h \
-    ui/userinfopanel.h \
-    ui/zoombutton.h \
-    ui/zoombuttonpanel.h \
     ui/listcommon.h \    
     ui/listview.h \
     ui/listitem.h \
     ui/listitemdelegate.h \
-    ui/searchdialog.h \
+    ui/logindialog.h \
+    ui/locationlistitem.h \
+    ui/locationlistview.h \
+    ui/locationsearchpanel.h \
+    ui/mainwindow.h \
+    ui/mapscale.h \
     ui/panelbar.h \
+    ui/panelbase.h \
     ui/panelcommon.h \
     ui/panelcontentstack.h \
+    ui/panelcontextbuttonbar.h \
     ui/paneltab.h \
     ui/paneltabbar.h \
-    ui/tabbedpanel.h \
     ui/routingpanel.h \
     ui/routewaypointlistitem.h \
     ui/routewaypointlistview.h \
-    user/user.h \
-    engine/contactmanager.h
+    ui/searchdialog.h \
+    ui/searchhistorylistitem.h \
+    ui/searchhistorylistview.h \
+    ui/settingsdialog.h \
+    ui/tabbedpanel.h \
+    ui/textmodifier.h \
+    ui/userinfo.h \
+    ui/userinfopanel.h \
+    ui/zoombutton.h \
+    ui/zoombuttonpanel.h \
+    user/user.h
 QT += network \
     webkit
-
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
@@ -167,8 +182,6 @@ simulator {
                gps/gpspositionprivate.cpp
     HEADERS += network/networkhandlerprivatestub.h \
                gps/gpspositionprivate.h
-    SOURCES += engine/contactmanagerprivatestub.cpp
-    HEADERS += engine/contactmanagerprivatestub.h
     QT += maemo5
     CONFIG += mobility
     MOBILITY += location