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

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 4f084e6..633c529 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,7 +3,6 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-RESOURCES += images.qrc
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     ui/mapviewscreen.cpp \
@@ -12,7 +11,7 @@ SOURCES += main.cpp \
     map/mapview.cpp \
     map/mapscene.cpp \
     map/maptile.cpp \
-    map/mapfetcher.cpp \
+    map/mapfetcher.cpp\
     ui/pixmap.cpp \
     ui/infotab.cpp
 HEADERS += ui/mainwindow.h \
@@ -23,12 +22,20 @@ HEADERS += ui/mainwindow.h \
     map/mapscene.h \
     map/maptile.h \
     map/mapfetcher.h \
-    common.h \
+    map/mapcommon.h \
     ui/pixmap.h \
     ui/infotab.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)
+}
+
 # -----------------------------------------------------------------
 # Debian packetizing additions
 # -----------------------------------------------------------------
@@ -50,3 +57,4 @@ unix {
     target.path = $$BINDIR
     INSTALLS += target
 }
+RESOURCES +=