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/common.pri | |
| 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/common.pri')
| -rw-r--r-- | mkspecs/common.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri index ed96175b..3f56a948 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -112,6 +112,7 @@ contains(USE_CCACHE, "true") { QMAKE_CXX = ccache g++ } +<<<<<<< HEAD contains( CONFIG, coverage ) { QMAKE_CXXFLAGS *= -ftest-coverage -fprofile-arcs LIBS *= -lgcov @@ -121,6 +122,8 @@ contains( CONFIG, coverage ) { *.gcno \ *.gcov } +======= +>>>>>>> 507ccca19d145aa4816e4622e0ce5f5d1a0b9e5d QMAKE_LIBDIR += $${M_BUILD_TREE}/lib |