Merge branch 'wallika-own'

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 25445a3..692831f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -29,7 +29,7 @@ HEADERS += ui/mainwindow.h \
     map/mapscene.h \
     map/maptile.h \
     map/mapfetcher.h \
-    common.h \
+    map/mapcommon.h \
     ui/pixmap.h \
     ui/infotab.h \
     ui/updatelocation/updatelocationdialog.h \
@@ -43,6 +43,14 @@ HEADERS += ui/mainwindow.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
 # -----------------------------------------------------------------
@@ -70,3 +78,4 @@ unix {
     target.path = $$BINDIR
     INSTALLS += target
 }
+RESOURCES +=