X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fsrc.pro;h=4b3c123eeb66c0f741beabcdf0da7b86d67fb1d9;hb=b1971264e6e95cb5f13ce8f2ca852edd028a8869;hp=599d8312aca8988ce2313cdea5edf41acbbc9bbe;hpb=10c1982f7896ab11331d4a4e9c51ac7434a0dcd2;p=situare diff --git a/src/src.pro b/src/src.pro index 599d831..4b3c123 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,16 +3,18 @@ # ------------------------------------------------- TARGET = ../situare TEMPLATE = app -INCLUDEPATH += /usr/include/qjson LIBS += -lqjson RESOURCES += ../images.qrc \ ../languages.qrc TRANSLATIONS += ../res/languages/situare_fi.ts SOURCES += main.cpp \ application.cpp \ + coordinates/geocoordinate.cpp \ + coordinates/scenecoordinate.cpp \ + engine/contactmanager.cpp \ engine/engine.cpp \ + engine/mce.cpp \ facebookservice/facebookauthentication.cpp \ - facebookservice/facebookcredentials.cpp \ gps/gpsposition.cpp \ map/baselocationitem.cpp \ map/friendgroupitem.cpp \ @@ -21,6 +23,7 @@ SOURCES += main.cpp \ map/gpslocationitem.cpp \ map/mapengine.cpp \ map/mapfetcher.cpp \ + map/maprouteitem.cpp \ map/mapscene.cpp \ map/mapscroller.cpp \ map/maptile.cpp \ @@ -31,45 +34,66 @@ SOURCES += main.cpp \ network/networkcookiejar.cpp \ network/networkhandler.cpp \ network/networkreply.cpp \ + routing/geocodingservice.cpp \ + routing/location.cpp \ + routing/route.cpp \ + routing/routesegment.cpp \ + routing/routingservice.cpp \ situareservice/imagefetcher.cpp \ situareservice/situareservice.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/logindialog.cpp \ + ui/indicatorbutton.cpp \ + ui/listitem.cpp \ + ui/listitemdelegate.cpp \ + ui/listview.cpp \ + ui/locationlistitem.cpp \ + ui/locationlistview.cpp \ + ui/indicatorbuttonpanel.cpp \ + ui/locationsearchpanel.cpp \ ui/mainwindow.cpp \ ui/mapscale.cpp \ - ui/panelsidebar.cpp \ - ui/panelsliderbar.cpp \ + ui/panelbar.cpp \ + ui/panelbase.cpp \ + ui/panelcontentstack.cpp \ + ui/panelcontextbuttonbar.cpp \ + ui/paneltab.cpp \ + ui/paneltabbar.cpp \ + ui/routingpanel.cpp \ + ui/routewaypointlistitem.cpp \ + ui/routewaypointlistview.cpp \ + ui/searchdialog.cpp \ + ui/searchhistorylistitem.cpp \ + ui/searchhistorylistview.cpp \ ui/settingsdialog.cpp \ - ui/sidepanel.cpp \ - ui/sidepanelbase.cpp \ + ui/tabbedpanel.cpp \ + ui/textmodifier.cpp \ ui/userinfo.cpp \ ui/userinfopanel.cpp \ ui/zoombutton.cpp \ ui/zoombuttonpanel.cpp \ user/user.cpp \ - ui/fullscreenbutton.cpp \ - engine/mce.cpp \ - routing/routingservice.cpp \ - routing/routesegment.cpp \ - routing/route.cpp \ - map/maprouteitem.cpp \ - coordinates/scenecoordinate.cpp \ - coordinates/geocoordinate.cpp \ - ui/listview.cpp \ - ui/listitem.cpp \ - ui/listitemdelegate.cpp \ - ui/friendlistitemdelegate.cpp + ui/listitemcontextbuttonbar.cpp \ + engine/updatelocation.cpp HEADERS += application.h \ common.h \ + coordinates/geocoordinate.h \ + coordinates/scenecoordinate.h \ + engine/contactmanager.h \ engine/engine.h \ + engine/mce.h \ + error.h \ facebookservice/facebookauthentication.h \ - facebookservice/facebookcommon.h \ - facebookservice/facebookcredentials.h \ gps/gpscommon.h \ gps/gpsposition.h \ map/baselocationitem.h \ @@ -80,65 +104,86 @@ HEADERS += application.h \ map/mapcommon.h \ map/mapengine.h \ map/mapfetcher.h \ + map/maprouteitem.h \ map/mapscene.h \ map/mapscroller.h \ map/maptile.h \ map/maptilerequest.h \ map/mapview.h \ + map/osm.h \ map/ownlocationitem.h \ network/networkaccessmanager.h \ network/networkcookiejar.h \ network/networkhandler.h \ network/networkreply.h \ + routing/geocodingservice.h \ + routing/location.h \ + routing/route.h \ + routing/routesegment.h \ + routing/routingcommon.h \ + routing/routingservice.h \ situareservice/imagefetcher.h \ situareservice/situarecommon.h \ situareservice/situareservice.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 \ + ui/friendlistview.h \ + ui/fullscreenbutton.h \ ui/imagebutton.h \ - ui/logindialog.h \ + ui/indicatorbutton.h \ + ui/indicatorbuttonpanel.h \ + ui/listcommon.h \ + ui/listview.h \ + ui/listitem.h \ + ui/listitemdelegate.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/panelsidebar.h \ - ui/panelsliderbar.h \ + ui/panelcontentstack.h \ + ui/panelcontextbuttonbar.h \ + ui/paneltab.h \ + ui/paneltabbar.h \ + ui/routingpanel.h \ + ui/routewaypointlistitem.h \ + ui/routewaypointlistview.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/sidepanel.h \ - ui/sidepanelbase.h \ ui/zoombutton.h \ ui/zoombuttonpanel.h \ user/user.h \ - ui/fullscreenbutton.h \ - engine/mce.h \ - routing/routingservice.h \ - routing/routingcommon.h \ - routing/routesegment.h \ - routing/route.h \ - map/maprouteitem.h \ - map/osm.h \ - coordinates/scenecoordinate.h \ - coordinates/geocoordinate.h \ - ui/listview.h \ - ui/listitem.h \ - ui/listitemdelegate.h \ - ui/friendlistitemdelegate.h \ - ui/listcommon.h + ui/listitemcontextbuttonbar.h \ + engine/updatelocation.h QT += network \ webkit - DEFINES += QT_NO_DEBUG_OUTPUT simulator { SOURCES += network/networkhandlerprivatestub.cpp \ - gps/gpspositionprivate.cpp + gps/gpspositionprivate.cpp \ + engine/contactmanagerprivatestub.cpp \ + engine/mceprivatestub.cpp HEADERS += network/networkhandlerprivatestub.h \ - gps/gpspositionprivate.h - QT += maemo5 + gps/gpspositionprivate.h \ + engine/contactmanagerprivatestub.h \ + engine/mceprivatestub.h CONFIG += mobility MOBILITY += location } else:maemo5 { @@ -149,7 +194,7 @@ simulator { engine/mceprivate.cpp HEADERS += network/networkhandlerprivate.h \ engine/mceprivate.h - QT += dbus + QT += dbus xml CONFIG += icd2 qdbus SOURCES += gps/gpspositionprivateliblocation.cpp \ gps/liblocationwrapper.cpp \ @@ -158,8 +203,14 @@ simulator { gps/liblocationwrapper.h \ gps/geopositioninfo.h CONFIG += link_pkgconfig - PKGCONFIG += glib-2.0 liblocation mce + PKGCONFIG += glib-2.0 liblocation mce gtk+-2.0 libosso-abook-1.0 LIBS += -llocation + SOURCES += engine/contactmanagerprivate.cpp \ + ui/ossoabookdialog.cpp + HEADERS += engine/contactmanagerprivate.h \ + ui/ossoabookdialog.h + CONFIG += mobility + MOBILITY += contacts } else { SOURCES += gps/gpspositionprivatestub.cpp \ network/networkhandlerprivatestub.cpp \ @@ -167,6 +218,8 @@ simulator { HEADERS += gps/gpspositionprivatestub.h \ network/networkhandlerprivatestub.h \ engine/mceprivatestub.h + SOURCES += engine/contactmanagerprivatestub.cpp + HEADERS += engine/contactmanagerprivatestub.h } QT += maemo5 @@ -187,6 +240,8 @@ simulator { HEADERS += gps/gpspositionprivatestub.h \ network/networkhandlerprivatestub.h \ engine/mceprivatestub.h + SOURCES += engine/contactmanagerprivatestub.cpp + HEADERS += engine/contactmanagerprivatestub.h message(QJson built in) message(Make sure you have QJson development headers installed) message(install headers with: sudo apt-get install libqjson-dev)