Modified situare.pro and src/src.pro.

diff --git a/situare.pro b/situare.pro
index e4d3acb..b6b812f 100644 (file)
--- a/situare.pro
+++ b/situare.pro
@@ -1,27 +1,3 @@
-<<<<<<< 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 ) {
@@ -29,4 +5,3 @@ error("Use the qmake include with Qt4.6.2 or greater");
 }
 TEMPLATE = subdirs
 SUBDIRS = src
->>>>>>> master:situare.pro

diff --git a/src/src.pro b/src/src.pro
index 4eef797..631b02d 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,7 +10,8 @@ SOURCES += main.cpp \
     src/map/mapfetcher.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
-    ui/listviewscreen.h
+    ui/listviewscreen.h \
+    src/map/mapfetcher.h
 
 # -----------------------------------------------------------------
 # Debian packetizing additions