Fixed merge conflict

[easylist] / easylist.pro

diff --git a/easylist.pro b/easylist.pro
index 0a17108..74f5e0a 100755 (executable)
--- a/easylist.pro
+++ b/easylist.pro
@@ -6,7 +6,7 @@
 \r
 # This needs to be removed in order for the binary\r
 # to be chmod to 755 in the debian package.\r
-QT       += core gui maemo5\r
+QT       += core gui maemo5 network\r
 TARGET = easylist\r
 TEMPLATE = app\r
 DEPENDPATH += .\r
@@ -21,7 +21,9 @@ SOURCES += main.cpp\
     listform.cpp \\r
     editform.cpp \\r
     slidewidget.cpp \\r
-    chooselistform.cpp\r
+    chooselistform.cpp \\r
+    requestwebpage.cpp \\r
+    settingsform.cpp\r
 \r
 HEADERS  +=\\r
         mycheckbox.h \\r
@@ -32,13 +34,16 @@ HEADERS  +=\
     editform.h \\r
     slidewidget.h \\r
     chooselistform.h \\r
-    globals.h\r
+    globals.h \\r
+    requestwebpage.h \\r
+    settingsform.h\r
 \r
 FORMS    += \\r
     mainform.ui \\r
     listform.ui \\r
     editform.ui \\r
-    chooselistform.ui\r
+    chooselistform.ui \\r
+    settingsform.ui\r
 \r
 CONFIG += mobility\r
 \r