diff --git a/mtest/libmscore/text/CMakeLists.txt b/mtest/libmscore/text/CMakeLists.txt deleted file mode 100644 index dd91d097a7..0000000000 --- a/mtest/libmscore/text/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -#============================================================================= -# MuseScore -# Music Composition & Notation -# -# Copyright (C) 2011 Werner Schweer -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 -# as published by the Free Software Foundation and appearing in -# the file LICENSE.GPL -#============================================================================= - -set(TARGET tst_text) - -include(${PROJECT_SOURCE_DIR}/mtest/cmake.inc) - diff --git a/src/libmscore/tests/CMakeLists.txt b/src/libmscore/tests/CMakeLists.txt index c9744c6b9a..e3d576e9d8 100644 --- a/src/libmscore/tests/CMakeLists.txt +++ b/src/libmscore/tests/CMakeLists.txt @@ -61,6 +61,7 @@ set(MODULE_TEST_SRC ${CMAKE_CURRENT_LIST_DIR}/tst_spanners.cpp ${CMAKE_CURRENT_LIST_DIR}/tst_split.cpp ${CMAKE_CURRENT_LIST_DIR}/tst_splitstaff.cpp + # ${CMAKE_CURRENT_LIST_DIR}/tst_text.cpp not actual, not compile ) set(MODULE_TEST_LINK diff --git a/mtest/libmscore/text/tst_text.cpp b/src/libmscore/tests/tst_text.cpp similarity index 99% rename from mtest/libmscore/text/tst_text.cpp rename to src/libmscore/tests/tst_text.cpp index 416176d898..1ed2ebb9e7 100644 --- a/mtest/libmscore/text/tst_text.cpp +++ b/src/libmscore/tests/tst_text.cpp @@ -10,13 +10,12 @@ // the file LICENCE.GPL //============================================================================= -#include - +#include "testing/qtestsuite.h" +#include "testutils.h" #include "libmscore/text.h" #include "libmscore/score.h" #include "libmscore/sym.h" #include "libmscore/xml.h" -#include "mtest/testutils.h" using namespace Ms;