Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / file.list

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 0a8d428..24854fa 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -59,25 +59,8 @@ toolkit_src_files = \
    $(toolkit_src_dir)/controls/slider/slider-impl.cpp \
    $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
    $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-handles-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-popup-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
-   $(toolkit_src_dir)/controls/text-view/relayout-utilities.cpp   \
-   $(toolkit_src_dir)/controls/text-view/split-by-char-policies.cpp \
-   $(toolkit_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \
-   $(toolkit_src_dir)/controls/text-view/split-by-word-policies.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-actor-cache.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-processor.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-character-processor.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-impl.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor-dbg.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor.cpp \
-   $(toolkit_src_dir)/controls/text-view/text-view-word-processor.cpp \
+   $(toolkit_src_dir)/controls/text-controls/text-field-impl.cpp \
+   $(toolkit_src_dir)/controls/text-controls/text-label-impl.cpp \
    $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
    $(toolkit_src_dir)/controls/view/view-impl.cpp \
    $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \
@@ -90,6 +73,8 @@ toolkit_src_files = \
    $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
    $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
    $(toolkit_src_dir)/styling/style-manager-impl.cpp \
+   $(toolkit_src_dir)/text/rendering/text-backend-impl.cpp \
+   $(toolkit_src_dir)/text/multi-language-support-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \