Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
	adaptors/common/indicator-impl.h

Change-Id: Iaff09e5fd5ad5634b722a4dc4ecd96c0fce5f958

diff --combined build/tizen/adaptor/Makefile.am
index 321d8ff,ed609c7..a0796bc
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -74,12 -74,23 +74,17 @@@ endi
  adaptor_public_api_dir = ../../../adaptors/public-api
  include ../../../adaptors/public-api/file.list
  
+ # Devel API ( for use by Toolkit)
+ adaptor_devel_api_dir = ../../../adaptors/devel-api
+ include ../../../adaptors/devel-api/file.list
+ 
+ 
  # Static libraries
  static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
  include ../../../text/dali/internal/libunibreak/file.list
  
  ############# source files #############
  
 -if ASSIMP_ENABLED
 -tizen_platform_abstraction_src_files += $(tizen_assimp_src_files)
 -else
 -tizen_platform_abstraction_src_files += $(tizen_assimp_stubs_src_files)
 -endif # ASSIMP_ENABLED
 -
  # COMMON
  if COMMON_PROFILE
  
@@@ -182,6 -193,7 +187,7 @@@ libdali_adaptor_la_SOURCES = 
                       $(base_adaptor_src_files) \
                       $(tizen_platform_abstraction_src_files) \
                       $(text_abstraction_src_files) \
+                      $(devel_api_src_files) \
                       $(public_api_src_files) \
                       $(adaptor_internal_src_files)
  
@@@ -197,6 -209,7 +203,7 @@@ libdali_adaptor_la_includes = 
                        -I../../../adaptors/public-api \
                        -I../../../adaptors/integration-api \
                        -I../../../adaptors/public-api/adaptor-framework \
+                       -I../../../adaptors/devel-api/adaptor-framework \
                        -I../../../adaptors/common \
                        -I../../../adaptors/base/interfaces \
                        -I../../../adaptors/ \
@@@ -221,8 -234,6 +228,6 @@@ libdali_adaptor_la_includes += 
                        -I../../../adaptors/tizen
  endif
  
- daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
- daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
  daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
  daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
  
@@@ -264,6 -275,7 +269,6 @@@ libdali_adaptor_la_CXXFLAGS = 
                        $(LIBDRM_CFLAGS) \
                        $(LIBEXIF_CFLAGS) \
                        $(LIBCURL_CFLAGS) \
 -                      $(ASSIMP_CFLAGS) \
                        $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS)
  
  libdali_adaptor_la_LIBADD = \
@@@ -341,6 -353,8 +346,8 @@@ endi
  tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
  tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
  
+ tizenadaptordevelapidir= $(devincludepath)/dali/devel-api
+ 
  tizenadaptorintegrationapidir = $(devincludepath)/dali/integration-api/adaptors
  tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files)
  
@@@ -355,8 -369,11 +362,11 @@@ endi
  tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework
  tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files)
  
- tizentextabstractionpublicapidir = $(tizenadaptorpublicapidir)/text-abstraction
- tizentextabstractionpublicapi_HEADERS = $(text_abstraction_header_files)
+ tizenadaptorframeworkdevelapidir = $(tizenadaptordevelapidir)/adaptor-framework
+ tizenadaptorframeworkdevelapi_HEADERS = $(devel_api_adaptor_framework_header_files)
+ 
+ tizentextabstractiondevelapidir = $(tizenadaptordevelapidir)/text-abstraction
+ tizentextabstractiondevelapi_HEADERS = $(text_abstraction_header_files)
  
  if !UBUNTU_PROFILE
  
@@@ -384,9 -401,10 +394,10 @@@ linker_test_SOURCES = linker-test.cp
  linker_test_CXXFLAGS = \
    -I../../../adaptors/common \
    -I../../../adaptors/public-api \
-   -I../../../adaptors/integration-api \
+     -I../../../adaptors/integration-api \
    -I../../../adaptors/base/interfaces \
    -I../../../adaptors/public-api/adaptor-framework \
+   -I../../../adaptors/devel-api/adaptor-framework \
    $(DALI_ADAPTOR_CFLAGS) \
    $(DALICORE_CFLAGS) \
    $(VCONF_CFLAGS) \