diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/common.pri | 9 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_common.prf | 10 | ||||
| -rw-r--r-- | tests/common_bot.pri | 2 | ||||
| -rw-r--r-- | tests/coverage.pri | 2 |
5 files changed, 17 insertions, 8 deletions
@@ -569,7 +569,7 @@ if [ "$CFG_COVERAGE" = "yes" ]; then exit 1 fi - MEEGOTOUCHCONFIG_FEATURES="$MEEGOTOUCHCONFIG_FEATURES coverage" + MEEGOTOUCHCONFIG_CONFIG="$MEEGOTOUCHCONFIG_CONFIG coverage" fi if [ "$CFG_PCH" = "yes" ]; then diff --git a/mkspecs/common.pri b/mkspecs/common.pri index ce5c6288..ed96175b 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -112,17 +112,16 @@ contains(USE_CCACHE, "true") { QMAKE_CXX = ccache g++ } -contains( M_BUILD_FEATURES, coverage ) { - QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs - LIBS += -lgcov +contains( CONFIG, coverage ) { + QMAKE_CXXFLAGS *= -ftest-coverage -fprofile-arcs + LIBS *= -lgcov - QMAKE_CLEAN += \ + QMAKE_CLEAN *= \ *.gcda \ *.gcno \ *.gcov } - QMAKE_LIBDIR += $${M_BUILD_TREE}/lib include(shared.pri) diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index 04e8e405..356c1121 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -34,3 +34,13 @@ contains(TEMPLATE, app) { } LIBS += -L$${M_LIB_DIR} } + +contains( CONFIG, coverage ) { + QMAKE_CXXFLAGS *= -ftest-coverage -fprofile-arcs + LIBS *= -lgcov + + QMAKE_CLEAN *= \ + *.gcda \ + *.gcno \ + *.gcov +} diff --git a/tests/common_bot.pri b/tests/common_bot.pri index b09d96f3..8a415f9e 100644 --- a/tests/common_bot.pri +++ b/tests/common_bot.pri @@ -1,4 +1,4 @@ DEPENDS= -contains( M_BUILD_FEATURES, coverage ) { +contains( CONFIG, coverage ) { include(coverage.pri) } diff --git a/tests/coverage.pri b/tests/coverage.pri index 05e2ae6e..4a5d8108 100644 --- a/tests/coverage.pri +++ b/tests/coverage.pri @@ -19,7 +19,7 @@ coverage-xml.depends = check-xml coverage-xml.commands = @../coverage.py $$srcList($$TEST_SOURCES) .obj 90 -QMAKE_CLEAN += *.gcda *.gcno *.gcov *.log +QMAKE_CLEAN += *.log #there are some xml files used in testing #*.xml QMAKE_DISTCLEAN += *.gcda *.gcno *.gcov *.log |