X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fsrc.pro;h=8a3b76ea720f3bef99d22ed4e41c5e0018c340be;hb=38cc39e42c81d0f7bbf6702c0dc49c984a2d2b7f;hp=10e7c8a7a4d16f4c95bf18fc3bd616a69e181074;hpb=36a3c5c99da3986bc93860bf453f9771ee8930ce;p=situare diff --git a/src/src.pro b/src/src.pro index 10e7c8a..8a3b76e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,92 +9,156 @@ RESOURCES += ../images.qrc \ ../languages.qrc TRANSLATIONS += ../res/languages/situare_fi.ts SOURCES += main.cpp \ - ui/mainwindow.cpp \ - situareservice/situareservice.cpp \ - situareservice/imagefetcher.cpp \ - facebookservice/facebookcredentials.cpp \ + application.cpp \ + coordinates/geocoordinate.cpp \ + coordinates/scenecoordinate.cpp \ + engine/engine.cpp \ + engine/mce.cpp \ facebookservice/facebookauthentication.cpp \ + facebookservice/facebookcredentials.cpp \ + gps/gpsposition.cpp \ + map/baselocationitem.cpp \ + map/friendgroupitem.cpp \ + map/frienditemshandler.cpp \ + map/friendlocationitem.cpp \ + map/gpslocationitem.cpp \ map/mapengine.cpp \ - map/mapview.cpp \ + map/mapfetcher.cpp \ + map/maprouteitem.cpp \ map/mapscene.cpp \ + map/mapscroller.cpp \ map/maptile.cpp \ - map/mapfetcher.cpp \ + map/maptilerequest.cpp \ + map/mapview.cpp \ map/ownlocationitem.cpp \ - map/baselocationitem.cpp \ - map/friendlocationitem.cpp \ - ui/updatelocation/updatelocationdialog.cpp \ + network/networkaccessmanager.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/friendlistview.cpp \ - ui/friendlistitem.cpp \ - user/user.cpp \ + ui/updatelocation/updatelocationdialog.cpp \ ui/avatarimage.cpp \ - engine/engine.cpp \ - ui/settingsdialog.cpp \ - ui/logindialog.cpp \ - map/maptilerequest.cpp \ - ui/imagebutton.cpp \ + ui/extendedlistitem.cpp \ + ui/extendedlistitemdelegate.cpp \ + ui/extendedlistitemstore.cpp \ + ui/friendlistitem.cpp \ + ui/friendlistitemdelegate.cpp \ ui/friendlistpanel.cpp \ - ui/userinfopanel.cpp \ - ui/panelsidebar.cpp \ - ui/panelsliderbar.cpp \ - map/friendgroupitem.cpp \ - map/frienditemshandler.cpp \ - gps/gpsposition.cpp \ - map/gpslocationitem.cpp \ - ui/zoombuttonpanel.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 \ + ui/mapscale.cpp \ + ui/settingsdialog.cpp \ ui/userinfo.cpp \ - ui/sidepanel.cpp \ + ui/userinfopanel.cpp \ ui/zoombutton.cpp \ - network/networkaccessmanager.cpp \ - network/networkhandler.cpp \ - network/networkcookiejar.cpp \ - network/networkreply.cpp -HEADERS += ui/mainwindow.h \ + ui/zoombuttonpanel.cpp \ + ui/searchdialog.cpp \ + ui/panelbar.cpp \ + ui/panelcontentstack.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 \ + coordinates/geocoordinate.h \ + coordinates/scenecoordinate.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 \ + map/friendgroupitem.h \ + map/frienditemshandler.h \ + map/friendlocationitem.h \ + map/gpslocationitem.h \ + map/mapcommon.h \ map/mapengine.h \ - map/mapview.h \ + map/mapfetcher.h \ + map/maprouteitem.h \ map/mapscene.h \ + map/mapscroller.h \ map/maptile.h \ - map/mapfetcher.h \ - map/mapcommon.h \ + map/maptilerequest.h \ + map/mapview.h \ + map/osm.h \ map/ownlocationitem.h \ - map/baselocationitem.h \ - map/friendlocationitem.h \ - ui/updatelocation/updatelocationdialog.h \ - ui/updatelocation/texteditautoresizer.h \ - situareservice/situareservice.h \ - situareservice/situarecommon.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 \ - facebookservice/facebookcredentials.h \ - facebookservice/facebookauthentication.h \ - facebookservice/facebookcommon.h \ - ui/friendlistview.h \ - ui/friendlistitem.h \ - user/user.h \ + situareservice/situarecommon.h \ + situareservice/situareservice.h \ + ui/updatelocation/texteditautoresizer.h \ + ui/updatelocation/updatelocationdialog.h \ ui/avatarimage.h \ - engine/engine.h \ - ui/settingsdialog.h \ - ui/logindialog.h \ - map/maptilerequest.h \ - ui/imagebutton.h \ + ui/extendedlistitem.h \ + ui/extendedlistitemdelegate.h \ + ui/extendedlistitemstore.h \ + ui/friendlistitem.h \ + ui/friendlistitemdelegate.h \ ui/friendlistpanel.h \ - ui/userinfopanel.h \ - ui/panelcommon.h \ - ui/panelsidebar.h \ - ui/panelsliderbar.h \ - map/friendgroupitem.h \ - map/frienditemshandler.h \ - gps/gpsposition.h \ - map/gpslocationitem.h \ - gps/gpscommon.h \ - ui/zoombuttonpanel.h \ - common.h \ + ui/friendlistview.h \ + ui/fullscreenbutton.h \ + ui/imagebutton.h \ + ui/indicatorbutton.h \ + ui/indicatorbuttonpanel.h \ + ui/logindialog.h \ + ui/locationlistitem.h \ + ui/locationlistview.h \ + ui/mainwindow.h \ + ui/mapscale.h \ + ui/settingsdialog.h \ ui/userinfo.h \ - ui/sidepanel.h \ + ui/userinfopanel.h \ ui/zoombutton.h \ - network/networkaccessmanager.h \ - network/networkhandler.h \ - network/networkcookiejar.h \ - network/networkreply.h + ui/zoombuttonpanel.h \ + ui/listcommon.h \ + ui/listview.h \ + ui/listitem.h \ + ui/listitemdelegate.h \ + ui/searchdialog.h \ + ui/panelbar.h \ + ui/panelcommon.h \ + ui/panelcontentstack.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 @@ -112,25 +176,32 @@ simulator { armel { DEFINES += ARMEL INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include - SOURCES += network/networkhandlerprivate.cpp - HEADERS += network/networkhandlerprivate.h - QT += dbus - CONFIG += icd2 + SOURCES += network/networkhandlerprivate.cpp \ + engine/mceprivate.cpp + HEADERS += network/networkhandlerprivate.h \ + engine/mceprivate.h + QT += dbus xml + CONFIG += icd2 qdbus + SOURCES += gps/gpspositionprivateliblocation.cpp \ + gps/liblocationwrapper.cpp \ + gps/geopositioninfo.cpp + HEADERS += gps/gpspositionprivateliblocation.h \ + gps/liblocationwrapper.h \ + gps/geopositioninfo.h + CONFIG += link_pkgconfig + PKGCONFIG += glib-2.0 liblocation mce + LIBS += -llocation } else { - SOURCES += network/networkhandlerprivatestub.cpp - HEADERS += network/networkhandlerprivatestub.h + SOURCES += gps/gpspositionprivatestub.cpp \ + network/networkhandlerprivatestub.cpp \ + engine/mceprivatestub.cpp + HEADERS += gps/gpspositionprivatestub.h \ + network/networkhandlerprivatestub.h \ + engine/mceprivatestub.h } - SOURCES += gps/gpspositionprivateliblocation.cpp \ - gps/liblocationwrapper.cpp \ - gps/geopositioninfo.cpp \ - gps/geocoordinate.cpp - HEADERS += gps/gpspositionprivateliblocation.h \ - gps/liblocationwrapper.h \ - gps/geopositioninfo.h \ - gps/geocoordinate.h + QT += maemo5 - CONFIG += link_pkgconfig - PKGCONFIG += glib-2.0 liblocation + message([QJson]) message(Make sure you have QJson development headers installed) message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free) @@ -142,9 +213,11 @@ simulator { message(install headers with: apt-get install libqtm-dev) } else { SOURCES += gps/gpspositionprivatestub.cpp \ - network/networkhandlerprivatestub.cpp + network/networkhandlerprivatestub.cpp \ + engine/mceprivatestub.cpp HEADERS += gps/gpspositionprivatestub.h \ - network/networkhandlerprivatestub.h + network/networkhandlerprivatestub.h \ + engine/mceprivatestub.h message(QJson built in) message(Make sure you have QJson development headers installed) message(install headers with: sudo apt-get install libqjson-dev) @@ -160,7 +233,7 @@ unix { DATADIR = $$PREFIX/share DEFINES += DATADIR=\\\"$$DATADIR\\\" \ PKGDATADIR=\\\"$$PKGDATADIR\\\" - + # MAKE INSTALL desktop.path = $$DATADIR/applications/hildon desktop.files += situare.desktop