diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-10-22 14:45:54 +0300 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-10-22 14:45:54 +0300 |
| commit | 45cea83ae5da3734a74b0175d01f08dac14117b7 (patch) | |
| tree | ef3f6da1578a3c97f61234fdd3ef392bb1cc2032 /mkspecs/features | |
| parent | d6f0b93c4dd6451fb73fd9c6606f434602e69f77 (diff) | |
| parent | 507ccca19d145aa4816e4622e0ce5f5d1a0b9e5d (diff) | |
Merge branch 'master' of gitorious.org:meegotouch/libmeegotouch
Conflicts:
mkspecs/common.pri
mkspecs/features/meegotouch_common.prf
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/meegotouch_common.prf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index 356c1121..c654efb5 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -36,10 +36,17 @@ contains(TEMPLATE, app) { } contains( CONFIG, coverage ) { +<<<<<<< HEAD QMAKE_CXXFLAGS *= -ftest-coverage -fprofile-arcs LIBS *= -lgcov QMAKE_CLEAN *= \ +======= + QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs + LIBS += -lgcov + + QMAKE_CLEAN += \ +>>>>>>> 507ccca19d145aa4816e4622e0ce5f5d1a0b9e5d *.gcda \ *.gcno \ *.gcov |