diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-10-22 15:58:22 +0300 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-10-22 15:58:22 +0300 |
| commit | 55dd2732f95e412b8d0aa28b1ae1cb8649fb71d2 (patch) | |
| tree | 05ccd479bdb2a7486f20e53d83190fd68aa247d5 /mkspecs | |
| parent | 45cea83ae5da3734a74b0175d01f08dac14117b7 (diff) | |
fix
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common.pri | 3 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_common.prf | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri index 3f56a948..ed96175b 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -112,7 +112,6 @@ contains(USE_CCACHE, "true") { QMAKE_CXX = ccache g++ } -<<<<<<< HEAD contains( CONFIG, coverage ) { QMAKE_CXXFLAGS *= -ftest-coverage -fprofile-arcs LIBS *= -lgcov @@ -122,8 +121,6 @@ contains( CONFIG, coverage ) { *.gcno \ *.gcov } -======= ->>>>>>> 507ccca19d145aa4816e4622e0ce5f5d1a0b9e5d QMAKE_LIBDIR += $${M_BUILD_TREE}/lib diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index c654efb5..356c1121 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -36,17 +36,10 @@ 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 |