Merge "Add support for new accessibility actions" into devel/master

diff --cc adaptors/common/adaptor-impl.cpp
Simple merge

diff --cc adaptors/x11/event-handler-x.cpp
Simple merge

diff --cc adaptors/x11/file.list
Simple merge

diff --cc build/tizen/adaptor/Makefile.am
index f9aeee6,f61b4f8..d4504a9
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -270,10 -276,9 +270,11 @@@ libdali_adaptor_la_CXXFLAGS = 
                        $(LIBEXIF_CFLAGS) \
                        $(LIBCURL_CFLAGS) \
                        $(ASSIMP_CFLAGS) \
-                       $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS)
+                       $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
+                       $(ELDBUS_CFLAGS)
  
 +libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS)
 +
  libdali_adaptor_la_LIBADD = \
                        $(DALICORE_LIBS) \
                        $(OPENGLES20_LIBS) \
@@@ -295,9 -300,9 +296,10 @@@
                        $(CAPI_APPFW_APPLICATION_LIBS) \
                        $(HARFBUZZ_LIBS) \
                        $(CAPI_SYSTEM_INFO_LIBS) \
+                       $(ELDBUS_LIBS) \
                        -lgif \
 -                      -lboost_thread
 +                      -lboost_thread \
 +                      -lturbojpeg
  
  if WAYLAND
  libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS)

diff --cc build/tizen/configure.ac
Simple merge