Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

9 files changed, 50 insertions, 54 deletions

diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp
index 7f1fec2..a39aa6f 100644
--- a/src/declarative/extra/qmlsqlconnection.cpp
+++ b/src/declarative/extra/qmlsqlconnection.cpp
@@ -67,6 +67,26 @@ public:
 /*!
     \qmlclass SqlConnection QmlSqlConnection
     \brief The SqlConnection element describes a connection to an SQL database.
+
+    The SqlConnection element works in a similar way to
+    QSqlDatabase::addDatabase().  It allows setting the database properties
+    such that the connection does not need to be set up in C++ code.
+    It differs from QSqlDatabase::addDatabase() in that it will automatically
+    open the database.
+
+    The database can then either be used from an SqlQuery element using its id
+    as a bind, or using its name.  If the database is set up externally to
+    Qml the query should connect using its name.
+
+    \qml
+    <SqlConnection id="myConnection">
+        <name>qmlConnection</name>
+        <driver>QSQLITE</driver>
+        <databaseName>"mydb.sqlite"</databaseName>
+    </SqlConnection>
+    <SqlQuery id="listmodel" connection="{myConnection}">SELECT * FROM mytable</SqlQuery>
+    <SqlQuery id="othermodel" connection="qmlConnection">SELECT * FROM myothertable</SqlQuery>
+    \endqml
 */
 
 /*!
@@ -142,32 +162,9 @@ public:
 */
 
 /*!
+    \internal
     \class QmlSqlConnection
     \brief The QmlSqlConnection class manages a connection to an SQL database.
-
-    \qmltext
-
-    The SqlConnection element works in a similar way to
-    QSqlDatabase::addDatabase().  It allows setting the database properties
-    such that the connection does not need to be set up in C++ code.
-    It differs from QSqlDatabase::addDatabase() in that it will automatically
-    open the database.
-
-    The database can then either be used from an SqlQuery element using its id
-    as a bind, or using its name.  If the database is set up externally to
-    Qml the query should connect using its name.
-
-    \qml
-    <SqlConnection id="myConnection">
-        <name>qmlConnection</name>
-        <driver>QSQLITE</driver>
-        <databaseName>"mydb.sqlite"</databaseName>
-    </SqlConnection>
-    <SqlQuery id="listmodel" connection="{myConnection}">SELECT * FROM mytable</SqlQuery>
-    <SqlQuery id="othermodel" connection="qmlConnection">SELECT * FROM myothertable</SqlQuery>
-    \endqml
-
-    \endqmltext
 */
 
 /*!
diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp
index 39f4c1e..70b3bdd 100644
--- a/src/declarative/extra/qmlsqlquery.cpp
+++ b/src/declarative/extra/qmlsqlquery.cpp
@@ -67,16 +67,8 @@ public:
 
 /*!
     \qmlclass SqlBind QmlSqlBind
-    \brief the SqlBind element specifies a value binding for an SqlQuery element.
-*/
+    \brief The SqlBind element specifies a value binding for an SqlQuery element.
 
-/*!
-    \class QmlSqlBind
-    \brief The QmlSqlBind class specifies a value binding for a QmlSqlQuery.
-
-    \qmltext
-
-    \qml
     By using bindings its possible to cause a SqlQuery to update itself
     when values bound through the SqlBind change.  Hence in the example
     below the results for the SqlQuery will change as searchText changes.
@@ -84,6 +76,7 @@ public:
     If the query is not a SELECT statement, the effects of the bound
     values will only apply when the SqlQuery exec() slot is called.
 
+    \qml
     <SqlQuery>
         SELECT * FROM mytable WHERE name LIKE :value
         <bindings>
@@ -97,7 +90,12 @@ public:
         </bindings>
     <SqlQuery>
     \endqml
-    \endqmltext
+*/
+
+/*!
+    \internal
+    \class QmlSqlBind
+    \brief The QmlSqlBind class specifies a value binding for a QmlSqlQuery.
 */
 
 /*!
@@ -235,13 +233,7 @@ public:
 /*!
     \qmlclass SqlQuery QmlSqlQuery
     \brief The SqlQuery element describes a query into an SQL database.
-*/
-
-/*
-    \class QmlSqlQuery
-    \brief the QmlSqlQuery class manages a query into an SQL database.
 
-    \qmltext
     The SqlQuery element has three parts.  The first is the query itself,
     which can either be specified using the query property or by the
     default text for the element.  The second specifies the connection
@@ -256,11 +248,11 @@ public:
     the query.
 
     If the query is a select statement it can be used as a model for a ListView.
-    The roles will be the columns of the result set.  Use the SQL AS keyword 
+    The roles will be the columns of the result set.  Use the SQL AS keyword
     in the query if you want to override the column names from that of the
     table selected.  You should also use the AS keyword if there is no
     appropriate table column name for the result column.
-        
+
     \qml
     <SqlQuery connection="{qmlConnectionId}" query="DELETE FROM mytable"/>
     <SqlQuery connection="connectionName">
@@ -268,7 +260,11 @@ public:
     </SqlQuery>
     <SqlQuery>SELECT id AS recordId, (firstName || ' ' || lastName) AS fullName FROM mytable</SqlQuery>
     \endqml
-    \endqmltext
+*/
+
+/*
+    \class QmlSqlQuery
+    \brief the QmlSqlQuery class manages a query into an SQL database.
 */
 
 /*!
diff --git a/src/declarative/fx/qfximageitem.cpp b/src/declarative/fx/qfximageitem.cpp
index 52ab009..d751845 100644
--- a/src/declarative/fx/qfximageitem.cpp
+++ b/src/declarative/fx/qfximageitem.cpp
@@ -58,10 +58,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QFxImageItem
-    \brief The QFxImageItem class is an abstract base class for QFxView items that render using QPainter.
+    \brief The QFxImageItem class is an abstract base class for QFxView items that want cached painting.
     \ingroup group_coreitems
 
-    This is a convenience class allowing easy use of a QPainter within a custom
+    This is a convenience class allowing easy use of cached painting within a custom
     item.  The contents of the item are are cached behind the scenes.
     The dirtyCache() function should be called if the contents change to
     ensure the cache is refreshed the next time painting occurs.
diff --git a/src/declarative/fx/qfxpainted.cpp b/src/declarative/fx/qfxpainted.cpp
index 7c88ce3..68918c3 100644
--- a/src/declarative/fx/qfxpainted.cpp
+++ b/src/declarative/fx/qfxpainted.cpp
@@ -45,12 +45,13 @@
 
 QT_BEGIN_NAMESPACE
 /*!
+    \internal
     \class QFxPainted
-    \brief The QFxPainted class is an abstract base class for QFxView items that paint using QPainter.
+    \brief The QFxPainted class is an abstract base class for QFxView items that want cached painting.
 
     \ingroup group_coreitems
 
-    This is a convenience class allowing easy use of QPainter within a custom item.
+    This is a convenience class allowing easy use of cached painting within a custom item.
     The contents of the item are cached behind the scenes. Any time you change the contents
     you should call markDirty to make sure the cache is refreshed the next time painting occurs.
 
diff --git a/src/declarative/fx/qfxpainted.h b/src/declarative/fx/qfxpainted.h
index 32f5dcb..1f22414 100644
--- a/src/declarative/fx/qfxpainted.h
+++ b/src/declarative/fx/qfxpainted.h
@@ -44,12 +44,15 @@
 
 #include <qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+/*
+WARNING: INTENDED TO MERGE WITH QFxImageItem
+*/
+
 class QFxPaintedPrivate;
 class Q_DECLARATIVE_EXPORT QFxPainted : public QFxItem
 {
diff --git a/src/declarative/opengl/gltexture.cpp b/src/declarative/opengl/gltexture.cpp
index 6d737ad..199b362 100644
--- a/src/declarative/opengl/gltexture.cpp
+++ b/src/declarative/opengl/gltexture.cpp
@@ -45,6 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 /*!
+    \internal
     \class GLTexture
     \brief The GLTexture class simplifies the use of OpenGL textures.
 */
diff --git a/src/declarative/qml/script/qmlbasicscript.cpp b/src/declarative/qml/script/qmlbasicscript.cpp
index 8b38e08..603e6ba 100644
--- a/src/declarative/qml/script/qmlbasicscript.cpp
+++ b/src/declarative/qml/script/qmlbasicscript.cpp
@@ -252,6 +252,7 @@ struct QmlBasicScriptCompiler
 };
 
 /*!
+    \internal
     \class QmlBasicScript
     \brief The QmlBasicScript class provides a fast implementation of a limited subset of JavaScript bindings.
 
diff --git a/src/declarative/timeline/qmltimeline.cpp b/src/declarative/timeline/qmltimeline.cpp
index 3fa0161..dcc8745 100644
--- a/src/declarative/timeline/qmltimeline.cpp
+++ b/src/declarative/timeline/qmltimeline.cpp
@@ -51,10 +51,6 @@
 
 QT_BEGIN_NAMESPACE
 
-//
-// Timeline stuff
-//
-
 struct Update {
     Update(QmlTimeLineValue *_g, qreal _v)
         : g(_g), v(_v) {}
@@ -868,9 +864,10 @@ void QmlTimeLine::remove(QmlTimeLineObject *v)
 }
 
 /*!
+    \internal
     \class QmlTimeLineValue
     \ingroup group_animation
-    \brief The QmlTimeLineValue class is modified by QmlTimeLine.
+    \brief The QmlTimeLineValue class provides a value that can be modified by QmlTimeLine.
 */
 
 /*!
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index d5765c1..4b8ce4e 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -617,7 +617,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
     \brief The ColorAnimation allows you to animate color changes.
 
     \code
-    ColorAnimation { from: "white" to: "#c0c0c0"; duration: 100 }
+    ColorAnimation { from: "white"; to: "#c0c0c0"; duration: 100 }
     \endcode
 
     The default property animated is \c color, but like other animations,