Merge branch 'image_fetcher'

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 97140ac..78b2559 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,6 +11,7 @@ SOURCES += main.cpp \
     ui/mapviewscreen.cpp \
     ui/listviewscreen.cpp \
     situareservice/situareservice.cpp \
+    situareservice/imagefetcher.cpp \
     cookiehandler/cookiehandler.cpp \
     facebookservice/facebookcredentials.cpp \
     facebookservice/facebookauthentication.cpp \
@@ -23,7 +24,9 @@ SOURCES += main.cpp \
     ui/infotab.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
-    user/user.cpp
+    engine/engine.cpp \
+    user/user.cpp \
+    ui/settingsdialog.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -39,11 +42,14 @@ HEADERS += ui/mainwindow.h \
     ui/updatelocation/texteditautoresizer.h \
     situareservice/situareservice.h \
     situareservice/situarecommon.h \
+    situareservice/imagefetcher.h \
     cookiehandler/cookiehandler.h \
     facebookservice/facebookcredentials.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
-    user/user.h
+    engine/engine.h \
+    user/user.h \
+    ui/settingsdialog.h
 QT += network \
     webkit
 
@@ -53,17 +59,14 @@ QT += network \
     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)
-
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)
 }
-
-maemo5 {
+maemo5 { 
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)
-    message(and deb-src http://repository.maemo.org/extras-devel fremantle free non-free)
     message(to scratchbox's sources.list in /etc/apt)
     message(run: apt-get update)
     message(install headers with: apt-get install libqjson-dev)