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

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

diff --git a/src/vicar-telepathy/vicar-telepathy.pro b/src/vicar-telepathy/vicar-telepathy.pro
index 87b28d1..aa4de48 100644 (file)
--- a/src/vicar-telepathy/vicar-telepathy.pro
+++ b/src/vicar-telepathy/vicar-telepathy.pro
@@ -1,7 +1,11 @@
 #INCLUDEPATH += /usr/include/telepathy-1.0
 #LIBS += /usr/lib/libtelepathy-qt4.so
 
+<<<<<<< HEAD
 contains(MEEGO_EDITION,harmattan){
+=======
+exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"){
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
    DEFINES += Q_WS_MAEMO_6
 }