Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / src / vicar-daemon / vicar-daemon.pro

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
index 4f89a0a..9ac1d4a 100755 (executable)
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@ -9,11 +9,20 @@ PKGCONFIG += glib-2.0 gconf-2.0
 
 LIBS += ../lib/libvicar.a
 
-CONFIG += qt debug
+CONFIG += qt debug console
+CONFIG -= app_bundle
+
 QT += dbus sql
 QT -= gui
 TEMPLATE = app
 TARGET = vicar-daemon
+<<<<<<< HEAD
+
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
+
+=======
 CONFIG += console
 CONFIG -= app_bundle
 
@@ -21,6 +30,7 @@ VPATH += cpp
 MOC_DIR = cpp/.mocs
 OBJECTS_DIR = cpp/.objs
 
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 SOURCES += cpp/main.cpp \
     cpp/callrouter.cpp \
     cpp/vicardbusadaptor.cpp