Revert "[3.0] Mark Clipping API as being part of the Tizen 3 version"

This reverts commit 334442ab65c242cf6da1435749a5c5c5bb69f592.

Change-Id: I4534fc105639ca3e523e58d48d5d732a4ac6384f

diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h
index f82e8bd..78b861d 100644 (file)
--- a/dali/public-api/actors/actor-enumerations.h
+++ b/dali/public-api/actors/actor-enumerations.h
@@ -137,14 +137,14 @@ namespace VerticalAlignment
 
 /**
  * @brief The ClippingMode describes how this Actors children will be clipped against it.
- * @SINCE_1_2_5
+ * @SINCE_1_2.5
  */
 namespace ClippingMode
 {
   enum Type
   {
-    DISABLED,                     ///< This Actor will not clip its children. @SINCE_1_2_5
-    CLIP_CHILDREN,                ///< This Actor will clip all children to within its boundaries (the actor will also be visible itself). @SINCE_1_2_5
+    DISABLED,                     ///< This Actor will not clip its children. @SINCE_1_2.5
+    CLIP_CHILDREN,                ///< This Actor will clip all children to within its boundaries (the actor will also be visible itself). @SINCE_1_2.5
   };
 }
 

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 3c06e53..4e9731b 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -303,7 +303,7 @@ public:
       MINIMUM_SIZE,                                       ///< name "minimumSize",           type Vector2     @SINCE_1_0.0
       MAXIMUM_SIZE,                                       ///< name "maximumSize",           type Vector2     @SINCE_1_0.0
       INHERIT_POSITION,                                   ///< name "inheritPosition",       type bool        @SINCE_1_1.24
-      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2_5
+      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2.5
     };
   };
 

diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h
index ff4a38f..2d0d02f 100644 (file)
--- a/dali/public-api/rendering/renderer.h
+++ b/dali/public-api/rendering/renderer.h
@@ -167,15 +167,15 @@ namespace RenderMode
 
 /**
  * @brief Controls how this renderer uses its stencil properties and writes to the color buffer.
- * @SINCE_1_2_5
+ * @SINCE_1_2.5
  */
 enum Type
 {
-  NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer). @SINCE_1_2_5
-  AUTO,         ///< Managed by the Actor Clipping API. This is the default.                                      @SINCE_1_2_5
-  COLOR,        ///< Ingore stencil properties.  Write to the color buffer.                                       @SINCE_1_2_5
-  STENCIL,      ///< Use the stencil properties. Do not write to the color buffer.                                @SINCE_1_2_5
-  COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer.                                    @SINCE_1_2_5
+  NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer). @SINCE_1_2.5
+  AUTO,         ///< Managed by the Actor Clipping API. This is the default.                                      @SINCE_1_2.5
+  COLOR,        ///< Ingore stencil properties.  Write to the color buffer.                                       @SINCE_1_2.5
+  STENCIL,      ///< Use the stencil properties. Do not write to the color buffer.                                @SINCE_1_2.5
+  COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer.                                    @SINCE_1_2.5
 };
 
 } // namespace RenderMode
@@ -358,7 +358,7 @@ public:
        * @brief name "renderMode", type INTEGER
        * @see RenderMode
        * @note The default value is RenderMode::AUTO
-       * @SINCE_1_2_5
+       * @SINCE_1_2.5
        */
       RENDER_MODE,