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

8 files changed, 18 insertions, 11 deletions

diff --git a/doc/src/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index e9f8029..8228737 100644
--- a/doc/src/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -68,12 +68,7 @@
     that is a qreal from 0 to 86400 representing the number of seconds since
     midnight, dummy data for this could be provided by \c dummydata/clock.qml:
     \code
-    Object {
-        properties: Property {
-            name: "time"
-            value: 12345
-        }
-    }
+    Object { property real time: 12345 }
     \endcode
     Any QML can be used in the dummy data files. You could even animate the
     fictional data!
diff --git a/doc/src/images/declarative-removebutton.gif b/doc/src/images/declarative-removebutton.gif
new file mode 100644
index 0000000..ca4d7e6
--- /dev/null
+++ b/doc/src/images/declarative-removebutton.gif
diff --git a/doc/src/images/declarative-tutorial-list-open.gif b/doc/src/images/declarative-tutorial-list-open.gif
new file mode 100644
index 0000000..5b93597
--- /dev/null
+++ b/doc/src/images/declarative-tutorial-list-open.gif
diff --git a/doc/src/images/declarative-tutorial-list.gif b/doc/src/images/declarative-tutorial-list.gif
new file mode 100644
index 0000000..24db426
--- /dev/null
+++ b/doc/src/images/declarative-tutorial-list.gif
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc
index 0775b12..d934f13 100644
--- a/doc/src/properties.qdoc
+++ b/doc/src/properties.qdoc
@@ -89,7 +89,12 @@
     and QWidget::setCursor(), and it also has a \c RESET function,
     QWidget::unsetCursor(), since no call to QWidget::setCursor() can
     mean \e {reset to the context specific cursor}. The \c RESET
-    function musrt return void and take no parameters.
+    function must return void and take no parameters.
+
+    \o A \c NOTIFY signal is optional. If defined, the signal will be
+    emitted whenever the value of the property changes. The signal must
+    take one parameter, which must be of the same type as the property; the
+    parameter will take the new value of the property.
 
     \o The \c DESIGNABLE attribute indicates whether the property
     should be visible in the property editor of GUI design tool (e.g.,
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index 39581a2..172bc60 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -932,6 +932,7 @@
     \o \l{qmake Variable Reference#QT}{QT}
     \o \l{qmake Variable Reference#RCC_DIR}{RCC_DIR}
     \o \l{qmake Variable Reference#REQUIRES}{REQUIRES}
+    \o \l{qmake Variable Reference#RESOURCES}{RESOURCES}
     \o \l{qmake Variable Reference#SOURCES}{SOURCES}
     \o \l{qmake Variable Reference#SUBDIRS}{SUBDIRS}
     \o \l{qmake Variable Reference#TARGET}{TARGET}
@@ -2420,6 +2421,12 @@
 
     This is mainly used in Qt's build system for building the examples.
 
+    \section1 RESOURCES
+
+    This variable contains the name of the resource collection file (qrc) 
+    for the application. Further information about the resource collection
+    file can be found at \l{The Qt Resource System}.
+
     \section1 RES_FILE
 
     This variable contains the name of the resource file for the application.
diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc
index ba7f79b..377cc9c 100644
--- a/doc/src/snippets/code/doc_src_properties.qdoc
+++ b/doc/src/snippets/code/doc_src_properties.qdoc
@@ -3,6 +3,7 @@ Q_PROPERTY(type name
            READ getFunction
            [WRITE setFunction]
            [RESET resetFunction]
+           [NOTIFY notifySignal]
            [DESIGNABLE bool]
            [SCRIPTABLE bool]
            [STORED bool]
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 543f274..75d0c06 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -106,7 +106,7 @@
     confirm icon on the left, the text "Remove" in the middle, and a
     cancel icon on the right.
 
-    \image declarative-removebutton.png
+    \image declarative-removebutton.gif
 
     Because Declarative UI is declarative, you don't pass instructions on
     what to paint in a sequential manner as you may be used to.  Instead
@@ -559,7 +559,7 @@
     data displayed, a delegate to indicate how elements are drawn and
     a view to arrange the elements.
 
-    \image declarative-tutorial-list.png
+    \image declarative-tutorial-list.gif
 
     For the purposes of this tutorial we will be using an SQL query as our
     data model.  This can be declared in the resources section of
@@ -604,8 +604,7 @@
     similar to how the contents of the FieldText and RemoveButton components
     are swapped in and out.
 
-    \image declarative-tutorial-list-closed.png
-    \image declarative-tutorial-list-open.png
+    \image declarative-tutorial-list-open.gif
 
     \snippet declarative/tutorials/contacts/3_Collections/2/ContactView.qml components