fix wrong merge ^_^
commitaa864a1c373e542cc09be9a96c4e1f33323d1782
authorAlbert Astals <albert.astals@canonical.com>
dateFri 4 Apr 2014, 10:01 (13 years ago)
parent36c97da
cmake/modules/QmlTest.cmake−1
@@ -147,7 +147,6 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
147147endmacro(add_binary_qml_test)
148148
149149macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
150−>>>>>>> MERGE-SOURCE
151150 add_custom_target(${qmltest_TARGET} ${qmltest_command})
152151
153152 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")