From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 23 Nov 2012 13:37:35 +0000 (+0100)
Subject: Mark scarc resource docs as internal for 5.0
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=498d45887c251ed79366ed083b26e68d2af99813;p=konrad%2Fqtdeclarative.git

Mark scarc resource docs as internal for 5.0

Change-Id: Ic3e235399161dcf0c9a259a5e94b4178d61eb5cb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc
index c830425..75205fa 100644
--- a/src/qml/doc/src/javascript/expressions.qdoc
+++ b/src/qml/doc/src/javascript/expressions.qdoc
@@ -330,6 +330,17 @@ an undefined order.
 Likewise, the \l {Component::onDestruction} handler definitions are triggered
 on component destruction.
 
+*/
+
+/*
+ \internal
+    NOTE: TODO Qt 5.1: We are not sufficiently confident about the implementation of scarce
+    resources in Qt 5.0.0, so mark this section as internal for now.
+    It should eventually become public API
+
+    There is another section about scarce resources in basictypes.qdoc. It should
+    be enabled at the same time.
+
 
 
 \section1 Scarce Resources in JavaScript
diff --git a/src/qml/doc/src/typesystem/basictypes.qdoc b/src/qml/doc/src/typesystem/basictypes.qdoc
index ab9e33c..281f3b8 100644
--- a/src/qml/doc/src/typesystem/basictypes.qdoc
+++ b/src/qml/doc/src/typesystem/basictypes.qdoc
@@ -480,7 +480,11 @@ property is only invoked when the property is reassigned to a different object v
     }
     \endqml
 
-    \section1 Using Scarce Resources with the var Type
+    \sa {QML Basic Types}
+*/
+/*
+ TODO Qt 5.1: see explanation in expressions.qdoc
+     \section1 Using Scarce Resources with the var Type
 
     A \c var type property can also hold an image or pixmap.
     A \c var which contains a QPixmap or QImage is known as a
@@ -496,11 +500,8 @@ property is only invoked when the property is reassigned to a different object v
     see \l{Scarce Resources in JavaScript}.
 
     This basic type is provided by the QML language.
-
-    \sa {QML Basic Types}
 */
 
-
 /*!
     \obsolete
     \qmlbasictype variant