From 19dfaca56bd409626a14b50d7d9cc22a958d93f4 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 4 Aug 2016 16:34:45 +0100 Subject: [PATCH] Preparation for minor version upgrade Change-Id: I623a869b2bc1bbe5a687c438b4e41d9e4c524158 --- build/tizen/docs/dali.doxy.in | 2 ++ dali-toolkit/public-api/controls/control-impl.h | 4 ++-- dali-toolkit/public-api/visuals/image-visual-properties.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index d2e0cae..3653af7 100644 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -344,9 +344,11 @@ ALIASES += clip{3}="\dontinclude \1 \n \skip \2 \n \until \3" # For Open Source DALi API Reference ALIASES += SINCE_1_0="@since 1.0" ALIASES += SINCE_1_1="@since 1.1" +ALIASES += SINCE_1_2="@since 1.2" ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 1.0" ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 1.1" +ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 1.2" ALIASES += PLATFORM="" ALIASES += PRIVLEVEL_PLATFORM="" diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index e3d0676..8b24a6f 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -296,7 +296,7 @@ protected: // For derived classes to call * In the case of the visual being an actor or control deeming controlRenderer not required then controlRenderer should be an empty handle. * No parenting is done during registration, this should be done by derived class. * - * @SINCE_1_1.46 + * @SINCE_1_2.0 * * @param[in] index The Property index of the visual, used to reference visual * @param[in] placementActor The actor used to by the visual. @@ -308,7 +308,7 @@ protected: // For derived classes to call * @brief Erase the entry matching the given index from the list of registered visuals * @param[in] index The Property index of the visual, used to reference visual * - * @SINCE_1_1.46 + * @SINCE_1_2.0 */ void UnregisterVisual( Property::Index index ); diff --git a/dali-toolkit/public-api/visuals/image-visual-properties.h b/dali-toolkit/public-api/visuals/image-visual-properties.h index b008dad..7d46ac7 100644 --- a/dali-toolkit/public-api/visuals/image-visual-properties.h +++ b/dali-toolkit/public-api/visuals/image-visual-properties.h @@ -102,7 +102,7 @@ enum /** * @brief This enables Image visuals to automatically be converted to Batch-Image visuals. * @details Name "batchingEnabled", type Property::BOOLEAN. - * @SINCE_1_1.46 + * @SINCE_1_2.0 * @note Optional. For Image visuals only. Not to be used with NPatch or SVG images. */ BATCHING_ENABLED, -- 2.7.4