Merge branch 'master' into laitiju

[situare] / situare.pro

diff --git a/situare.pro b/situare.pro
index c134f5d..e4d3acb 100644 (file)
--- a/situare.pro
+++ b/situare.pro
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:situare.pro
 # -------------------------------------------------
 # Project created by QtCreator 2010-03-26T07:57:35
 # -------------------------------------------------
@@ -20,3 +21,12 @@ HEADERS += src/map/mapfetcher.h \
     src/ui/mainwindow.h \
     tests/testmap/networkaccessmanagermock.h \
     tests/testmap/networkreplymock.h
+=======
+QMAKEVERSION = $$[QMAKE_VERSION]
+ISQT4 = $$find(QMAKEVERSION, ^[2-9])
+isEmpty( ISQT4 ) {
+error("Use the qmake include with Qt4.6.2 or greater");
+}
+TEMPLATE = subdirs
+SUBDIRS = src
+>>>>>>> master:situare.pro