From: Seungho, Baek <sbsh.baek@samsung.com>
Date: Tue, 14 Jul 2020 09:38:33 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20200715.002037~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d851ea33cbacad20913b03061b27c47bfd3d785d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor-legacy.git

Merge branch 'devel/master' into tizen
---

d851ea33cbacad20913b03061b27c47bfd3d785d
diff --cc dali/devel-api/file.list
index 41be6eb,789939d..3530a68
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@@ -2,10 -2,8 +2,11 @@@
  
  SET( devel_api_src_files
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-adaptor.cpp
+   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/application-devel.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-group.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-item.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-manager.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.cpp
@@@ -45,11 -42,9 +45,12 @@@ SET( devel_api_adaptor_framework_header
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-action-handler.h
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-gesture-handler.h
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-gesture-event.h
+   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.h
    ${adaptor_devel_api_dir}/adaptor-framework/application-devel.h
    ${adaptor_devel_api_dir}/adaptor-framework/atspi-accessibility.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-group.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-item.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-manager.h
    ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.h
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.h
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard.h
diff --cc packaging/dali-adaptor.spec
index 14df172,6d0908f..a7b1b4d
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -303,9 -303,9 +308,10 @@@ cmake_flags+=" -DCMAKE_INSTALL_PREFIX=$
  cmake_flags+=" -DCMAKE_INSTALL_LIBDIR=%{_libdir}"
  cmake_flags+=" -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}"
  cmake_flags+=" -DENABLE_TIZEN_MAJOR_VERSION=%{tizen_version_major}"
 +cmake_flags+=" -DENABLE_TIZEN_MINOR_VERSION=%{tizen_version_minor}"
  cmake_flags+=" -DENABLE_FEEDBACK=YES"
  cmake_flags+=" -DENABLE_APPFW=YES"
+ cmake_flags+=" -DCOMPONENT_APPLICATION_SUPPORT=YES"
  
  # Set up the build via Cmake
  #######################################################################