summaryrefslogtreecommitdiffstats
path: root/src/fbgui.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/fbgui.pro')
-rw-r--r--src/fbgui.pro11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/fbgui.pro b/src/fbgui.pro
index 3a8c518..5a4deea 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -1,14 +1,23 @@
TEMPLATE = app
TARGET = fbgui
-CONFIG += qt debug
+CONFIG += qt \
+ debug
QT += core \
gui \
webkit \
network
+<<<<<<< HEAD
HEADERS += fbbrowser.h \
downloadmanager.h
SOURCES += fbgui.cpp \
fbbrowser.cpp \
downloadmanager.cpp
+=======
+HEADERS += jsObject.h \
+ fbbrowser.h
+SOURCES += jsObject.cpp \
+ fbgui.cpp \
+ fbbrowser.cpp
+>>>>>>> a1c5fea9ed618b296548560d5806d99448cca262
FORMS += fbbrowser.ui
RESOURCES += fbgui.qrc