projects
/
vicar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fixed Merge issues
[vicar]
/
src
/
vicar-telepathy
/
vicar-telepathy.pro
diff --git
a/src/vicar-telepathy/vicar-telepathy.pro
b/src/vicar-telepathy/vicar-telepathy.pro
index
08b0fef
..
87b28d1
100644
(file)
--- a/
src/vicar-telepathy/vicar-telepathy.pro
+++ b/
src/vicar-telepathy/vicar-telepathy.pro
@@
-1,7
+1,7
@@
#INCLUDEPATH += /usr/include/telepathy-1.0
#LIBS += /usr/lib/libtelepathy-qt4.so
-exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"){
+contains(MEEGO_EDITION,harmattan){
DEFINES += Q_WS_MAEMO_6
}