From 59b8a692fe1442e1874d18c9532e6ddec73cc1ca Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Thu, 21 Apr 2016 14:38:50 +0100 Subject: [PATCH] Move the toolkit-text-model into a folder in the internal side of the test cases. Change-Id: Id09c79876077595ef129f236d5a6e6fde07bd20a Signed-off-by: Victor Cebollada --- automated-tests/src/dali-toolkit-internal/CMakeLists.txt | 3 ++- .../dali-toolkit-test-utils/toolkit-text-model.cpp | 0 .../dali-toolkit-test-utils/toolkit-text-model.h | 0 automated-tests/src/dali-toolkit/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename automated-tests/src/{dali-toolkit => dali-toolkit-internal}/dali-toolkit-test-utils/toolkit-text-model.cpp (100%) rename automated-tests/src/{dali-toolkit => dali-toolkit-internal}/dali-toolkit-test-utils/toolkit-text-model.h (100%) diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt index f1ca98f..b2a4e29 100644 --- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt @@ -31,7 +31,6 @@ LIST(APPEND TC_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp @@ -49,6 +48,7 @@ LIST(APPEND TC_SOURCES ../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp ../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp ../dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp + dali-toolkit-test-utils/toolkit-text-model.cpp ) @@ -68,6 +68,7 @@ INCLUDE_DIRECTORIES( ../../../ ${${CAPI_LIB}_INCLUDE_DIRS} ../dali-toolkit/dali-toolkit-test-utils + dali-toolkit-test-utils ) ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES}) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-model.cpp similarity index 100% rename from automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.cpp rename to automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-model.cpp diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-model.h similarity index 100% rename from automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.h rename to automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-model.h diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt index 27d7fec..15ffd4c 100644 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@ -68,7 +68,6 @@ LIST(APPEND TC_SOURCES dali-toolkit-test-utils/toolkit-physical-keyboard.cpp dali-toolkit-test-utils/toolkit-style-monitor.cpp dali-toolkit-test-utils/toolkit-singleton-service.cpp - dali-toolkit-test-utils/toolkit-text-model.cpp dali-toolkit-test-utils/toolkit-timer.cpp dali-toolkit-test-utils/toolkit-tts-player.cpp dali-toolkit-test-utils/dali-test-suite-utils.cpp -- 2.7.4