From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 7 Jun 2019 15:36:52 +0000 (+0000)
Subject: Merge "Basic support of keyboard focus for multiple windows" into devel/master
X-Git-Tag: dali_1.4.25~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=68b0edb7de863b5198ec0afeac0a7e351dd6bd24;hp=-c

Merge "Basic support of keyboard focus for multiple windows" into devel/master
---

68b0edb7de863b5198ec0afeac0a7e351dd6bd24
diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt
index 993601c,8617b79..2e0a4f9
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -18,7 -18,6 +18,7 @@@ SET(TC_SOURCE
    utc-Dali-CubeTransitionEffect.cpp
    utc-Dali-EffectsView.cpp
    utc-Dali-FlexContainer.cpp
 +  utc-Dali-FlexNode.cpp
    utc-Dali-GaussianBlurView.cpp
    utc-Dali-ImageView.cpp
    utc-Dali-ImageVisual.cpp
@@@ -82,6 -81,7 +82,7 @@@ LIST(APPEND TC_SOURCE
    dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
    dali-toolkit-test-utils/toolkit-environment-variable.cpp
    dali-toolkit-test-utils/toolkit-input-method-context.cpp
+   dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp
    dali-toolkit-test-utils/toolkit-orientation.cpp
    dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
    dali-toolkit-test-utils/toolkit-style-monitor.cpp
@@@ -92,6 -92,7 +93,7 @@@
    dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
    dali-toolkit-test-utils/toolkit-video-player.cpp
    dali-toolkit-test-utils/toolkit-web-engine.cpp
+   dali-toolkit-test-utils/toolkit-window.cpp
    dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp
    dali-toolkit-test-utils/dali-test-suite-utils.cpp
    dali-toolkit-test-utils/dali-toolkit-test-suite-utils.cpp