X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fvicar-telepathy%2Fvicar-telepathy.pro;h=aa4de4841437abb3be1579d3f743863d83ebe970;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hp=87b28d140f24c85cf4d412de1e613e350c0d9853;hpb=2b82f07726d657dff4ad091f056b8685d5ba9930;p=vicar

diff --git a/src/vicar-telepathy/vicar-telepathy.pro b/src/vicar-telepathy/vicar-telepathy.pro
index 87b28d1..aa4de48 100644
--- 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
 }