Merge branch 'devel/master' into tizen

diff --combined build/tizen/adaptor/Makefile.am
index 2fad247,5a6123e..caa27d9
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -64,6 -64,7 +64,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_ubuntu_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_trace_common_src_files) \
                    $(adaptor_thread_common_src_files) \
@@@ -116,6 -117,7 +117,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_common_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_window_system_tizen_src_files) \
                    $(adaptor_window_system_tizen_wayland_src_files) \
@@@ -178,6 -180,7 +180,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_common_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_window_system_tizen_src_files) \
                    $(adaptor_window_system_tizen_wayland_src_files) \
@@@ -239,6 -242,7 +242,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_common_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_window_system_tizen_src_files) \
                    $(adaptor_window_system_tizen_wayland_src_files) \
@@@ -299,6 -303,7 +303,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_common_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_window_system_tizen_src_files) \
                    $(adaptor_window_system_tizen_wayland_src_files) \
@@@ -362,6 -367,7 +367,7 @@@ LIBDALI_ADAPTOR_LA_SOURCES = 
                    $(adaptor_text_common_src_files) \
                    $(adaptor_resampler_src_files) \
                    $(adaptor_video_common_src_files) \
+                   $(adaptor_web_engine_common_src_files) \
                    $(adaptor_window_system_common_src_files) \
                    $(adaptor_window_system_tizen_src_files) \
                    $(adaptor_window_system_tizen_wayland_src_files) \
@@@ -586,15 -592,6 +592,15 @@@ LIBDALI_ADAPTOR_LA_LIBADD += -ljpe
  CFLAGS += -fPIC
  endif
  
 +if !UBUNTU_PROFILE
 +if WAYLAND
 +else
 +# X11
 +LIBDALI_ADAPTOR_LA_CXXFLAGS += $(UTILX_CFLAGS)
 +LIBDALI_ADAPTOR_LA_LIBADD += $(UTILX_LIBS)
 +endif
 +endif
 +
  tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
  tizenadaptorpublicapi_HEADERS = $(public_api_header_files)