From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 24 Sep 2015 13:09:46 +0000 (-0700)
Subject: Merge "Marked new API's since 1.1.4" into devel/master
X-Git-Tag: dali_1.1.4~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=618c084142032296c60a188b9438d63a81a2d264;hp=bf9e99f865d0af2d10df6af8770622eb618bfad2

Merge "Marked new API's since 1.1.4" into devel/master
---

diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index 1d8dd28..bac8835 100644
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -89,7 +89,7 @@ public:
     enum
     {
       STYLE_NAME = PROPERTY_START_INDEX,       ///< name "style-name",       @see SetStyleName,       type std::string
-      BACKGROUND,                              ///< name "background",       @see SetBackgroundImage, type Map
+      BACKGROUND,                              ///< name "background",       @see SetBackgroundImage, type Map,         @since DALi 1.1.4
       KEY_INPUT_FOCUS,                         ///< name "key-input-focus",  @see SetKeyInputFocus,   type bool
     };
   };
diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h
index f2a221c..6fa3474 100644
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -140,7 +140,10 @@ public:
    * @brief Sets this ImageView from an Image url
    *
    * If the handle is empty, ImageView will display nothing
+   *
    * @param[in] url The Image resource to display.
+   *
+   * @since DALi 1.1.4
    */
   void SetImage( const std::string& url );
 
diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
index 94ec859..0f7da0b 100644
--- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@ -36,7 +36,9 @@ class Model3dView;
  *
  * All the geometry loaded with the control is automatically centered and scaled to fit
  * the size of all the other controls. So the max is (0.5,0.5) and the min is (-0.5,-0.5)
-*/
+ *
+ * @since DALi 1.1.4
+ */
 class DALI_IMPORT_API Model3dView : public Control
 {
 public:
diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
index 0c6e18d..b236f04 100644
--- a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
@@ -30,6 +30,8 @@ namespace Toolkit
 /**
  * PageFactory is an abstract interface for providing image actors to PageTurnView
  * Each image actor is identified by a unique ID, and has a linear order from 0 to GetNumberOfPages()-1
+ *
+ * @since DALi 1.1.4
  */
 class DALI_IMPORT_API PageFactory
 {
diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
index 5da3a97..1fac650 100644
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -35,6 +35,8 @@ class PageTurnPortraitView;
 
 /**
  * PageTurnLandscapeView provides a page turn view in portrait mode
+ *
+ * @since DALi 1.1.4
  */
 class DALI_IMPORT_API PageTurnPortraitView : public PageTurnView
 {
diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
index d65d5ec..8099c26 100644
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
@@ -59,6 +59,8 @@ class PageTurnView;
  * | page-turn-finished | @ref PageTurnFinishedSignal() |
  * | page-pan-started   | @ref PagePanStartedSignal()   |
  * | page-pan-finished  | @ref PagePanFinishedSignal()  |
+ *
+ * @since DALi 1.1.4
  */
 class DALI_IMPORT_API PageTurnView : public Control
 {