diff options
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 |