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 8f6aad6..f988330 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -20,12 +20,18 @@ SOURCES += main.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 \
-    user/user.cpp
+    ui/settingsdialog.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -35,6 +41,9 @@ HEADERS += ui/mainwindow.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 \
@@ -46,28 +55,26 @@ HEADERS += ui/mainwindow.h \
     facebookservice/facebookcredentials.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
+    ui/buttonitem.h \
+    ui/situareuser.h \
     engine/engine.h \
-    user/user.h
+    user/user.h \
+    ui/settingsdialog.h
 QT += network \
     webkit
 
-# use don't use OpenGL when building in scratchbox
-!maemo5 { 
-    QT += opengl
-    message(OpenGL built in)
-    message(Make sure you have OpenGL development headers installed)
-    message(install headers with: sudo apt-get install libgl-dev libglu-dev)
+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 {
+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(and deb-src 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)