From: Bowon Ryu Date: Tue, 18 May 2021 01:10:56 +0000 (+0000) Subject: Merge "Add property ENABLE_GRAB_HANDLE_POPUP to TextEditor" into devel/master X-Git-Tag: dali_2.0.27~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4bcf7c57006f4241565c31c13dde06b8eea99855;hp=f60be4f8d8ca4e80c505c93c828d487be598d659 Merge "Add property ENABLE_GRAB_HANDLE_POPUP to TextEditor" into devel/master --- diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index cd463b5..2258fab 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -308,6 +308,7 @@ ENDIF() IF(NOT ANDROID) ADD_EXECUTABLE(${SHADER_GENERATOR_NAME} ${SHADER_GENERATOR_SOURCES}) + TARGET_LINK_LIBRARIES( ${SHADER_GENERATOR_NAME} ${COVERAGE} ) INSTALL(TARGETS ${SHADER_GENERATOR_NAME} RUNTIME DESTINATION bin) ELSE() # Need to build dali-shader-generator using the host compiler, not the android cross-compiler so diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index c3e32cb..484089b 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -29,7 +29,7 @@ namespace Toolkit { const unsigned int TOOLKIT_MAJOR_VERSION = 2; const unsigned int TOOLKIT_MINOR_VERSION = 0; -const unsigned int TOOLKIT_MICRO_VERSION = 25; +const unsigned int TOOLKIT_MICRO_VERSION = 26; const char* const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 94d8e11..ffa4069 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali2-toolkit Summary: Dali 3D engine Toolkit -Version: 2.0.25 +Version: 2.0.26 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT