Merge branch 'map' of https://vcs.maemo.org/git/situare into map

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 1a71743..f988330 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,43 +1,107 @@
 # -------------------------------------------------
 # Project created by QtCreator 2010-03-26T07:57:35
 # -------------------------------------------------
-TARGET = Situare
+TARGET = ../situare
 TEMPLATE = app
+INCLUDEPATH += "/usr/include/qjson"
+LIBS += "-lqjson"
+RESOURCES += ../images.qrc
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     ui/mapviewscreen.cpp \
-    ui/listviewscreen.cpp
+    ui/listviewscreen.cpp \
+    situareservice/situareservice.cpp \
+    situareservice/imagefetcher.cpp \
+    cookiehandler/cookiehandler.cpp \
+    facebookservice/facebookcredentials.cpp \
+    facebookservice/facebookauthentication.cpp \
+    map/mapengine.cpp \
+    map/mapview.cpp \
+    map/mapscene.cpp \
+    map/maptile.cpp \
+    map/mapfetcher.cpp \
+    map/mapzoompanel.cpp \
+    map/mapbutton.cpp \
+    map/ownlocationitem.cpp \
+    ui/pixmap.cpp \
+    ui/infotab.cpp \
+    ui/updatelocation/updatelocationdialog.cpp \
+    ui/updatelocation/texteditautoresizer.cpp \
+    user/user.cpp \
+    ui/buttonitem.cpp \
+    ui/situareuser.cpp \
+    engine/engine.cpp \
+    ui/settingsdialog.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
-    ui/listviewscreen.h
+    ui/listviewscreen.h \
+    map/mapengine.h \
+    map/mapview.h \
+    map/mapscene.h \
+    map/maptile.h \
+    map/mapfetcher.h \
+    map/mapcommon.h \
+    map/mapzoompanel.h \
+    map/mapbutton.h \
+    map/ownlocationitem.h \
+    ui/pixmap.h \
+    ui/infotab.h \
+    ui/updatelocation/updatelocationdialog.h \
+    ui/updatelocation/texteditautoresizer.h \
+    situareservice/situareservice.h \
+    situareservice/situarecommon.h \
+    situareservice/imagefetcher.h \
+    cookiehandler/cookiehandler.h \
+    facebookservice/facebookcredentials.h \
+    facebookservice/facebookauthentication.h \
+    facebookservice/facebookcommon.h \
+    ui/buttonitem.h \
+    ui/situareuser.h \
+    engine/engine.h \
+    user/user.h \
+    ui/settingsdialog.h
+QT += network \
+    webkit
+
+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 { 
+    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)
+    message(to scratchbox's sources.list in /etc/apt)
+    message(run: apt-get update)
+    message(install headers with: apt-get install libqjson-dev)
+}
 
 # -----------------------------------------------------------------
 # Debian packetizing additions
 # -----------------------------------------------------------------
 unix { 
     # VARIABLES
-    isEmpty(PREFIX):PREFIX = /usr/local
+    isEmpty(PREFIX):PREFIX = /usr
     BINDIR = $$PREFIX/bin
     DATADIR = $$PREFIX/share
-    DEFINES += DATADIR=\"$$DATADIR\" \
-        PKGDATADIR=\"$$PKGDATADIR\"
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+        PKGDATADIR=\\\"$$PKGDATADIR\\\"
     
     # MAKE INSTALL
-    INSTALLS += target \
-        desktop \
-        iconxpm \
-        icon26 \
-        icon40 \
-        icon64
-    target.path = $$BINDIR
     desktop.path = $$DATADIR/applications/hildon
-    desktop.files += $${TARGET}.desktop
-    iconxpm.path = $$DATADIR/pixmap
-    iconxpm.files += ../data/maemo/$${TARGET}.xpm
-    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
-    icon26.files += ../data/26x26/$${TARGET}.png
-    icon40.path = $$DATADIR/icons/hicolor/40x40/apps
-    icon40.files += ../data/40x40/$${TARGET}.png
+    desktop.files += situare.desktop
+    INSTALLS += desktop
+    icon48.path = $$DATADIR/icons/hicolor/48x48/apps
+    icon48.files += ../res/icon/48x48/situare.png
+    INSTALLS += icon48
     icon64.path = $$DATADIR/icons/hicolor/64x64/apps
-    icon64.files += ../data/64x64/$${TARGET}.png
+    icon64.files += ../res/icon/64x64/situare.png
+    INSTALLS += icon64
+    target.path = $$BINDIR
+    INSTALLS += target
 }
+RESOURCES +=