-<<<<<<< HEAD:situare.pro
-# -------------------------------------------------
-# Project created by QtCreator 2010-03-26T07:57:35
-# -------------------------------------------------
-TARGET = Situare
-TEMPLATE = app
-QT += network \
- testlib
-INCLUDEPATH += . \
- src/tests/testmap/ \
- src/map/
-SOURCES += src/map/mapfetcher.cpp \
- src/map/mapengine.cpp \
- tests/testmap/testmapfetcher.cpp \
-# tests/testmap/testmapengine.cpp \
- src/ui/mainwindow.cpp \
- tests/testmap/networkaccessmanagermock.cpp \
- tests/testmap/networkreplymock.cpp
-HEADERS += src/map/mapfetcher.h \
- src/map/mapengine.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
+SUBDIRS = src \
+ tests