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

8 files changed, 14 insertions, 19 deletions

diff --git a/doc/src/declarative/components.qdoc b/doc/src/declarative/components.qdoc
index 6564375..d7a4ba6 100644
--- a/doc/src/declarative/components.qdoc
+++ b/doc/src/declarative/components.qdoc
@@ -13,8 +13,8 @@ Writing and using components allows you to:
 \endlist
 
 Components are placed in \e <Name>.qml files, allowing \e <Name> to then be used as a tag
-elsewhere. For example, if you have a Slider.qml file, you can then use \c {Slider \{\}} to
-place a slider.
+elsewhere. For example, if you have a Slider.qml file, you can then use \c {Slider { ... }} to
+make a slider, just as if it was a built-in type.
 
 Components may be collected into \l {qmlmodules}{modules}.
 
@@ -78,15 +78,15 @@ MyButton { label: "Reset"; onClicked: resetData() }
 
 \section1 Placing .qml Files
 
-Component files should be placed in specific locations in order to be found by the Qml engine:
+When one component refers to a another, the second must be found either in the same directory
+as the first, or in a directory imported using the \c import statement:
 
-\list
-\o the run directory
-\o the run directory + "/qml"
-\o the directory of the Qml you are running
-\o the directory of the Qml you are running + "/qml"
-\endlist
+\code
+import "library"
+\endcode
+
+\section1 Namespaces
 
-In the future library-like directories will be defined (in the meantime the first two options above effectively serve this purpose).
+Namespaces for QML will be supported in Qt 4.6.
 
 */
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index fa9f05b..5ffcbf6 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -27,9 +27,4 @@ to be instructive on specific elements.
 
 Finally, check out the \l {tutorial} to learn a little more about writing your
 own QML-based applications.
-
-\note When running applications that only use the Fluid UI atoms under the 
-software rasterizer, a simple canvas backend is used by default. To use 
-Graphics View instead, set \c QML_USE_GRAPHICSVIEW=1.
-
 */
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index c2e3e22..6bb5012 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -14,7 +14,7 @@ Rect {
     id: Page
     width: 480
     height: 200
-    color: "white"
+    color: "LightGrey"
     Text {
         id: HelloText
         text: "Hello world!"
@@ -35,7 +35,7 @@ Rect {
     id: Page
     width: 480
     height: 200
-    color: "white"
+    color: "LightGrey"
 }
 \endcode
 
diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc
index 54f1828..1535c42 100644
--- a/doc/src/declarative/tutorial2.qdoc
+++ b/doc/src/declarative/tutorial2.qdoc
@@ -37,7 +37,7 @@ Rect {
     id: Page
     width: 480
     height: 200
-    color: "white"
+    color: "LightGrey"
     Text {
         id: HelloText
         text: "Hello world!"
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index 3ac22a1..0b97e63 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -16,7 +16,7 @@ Rect {
     id: Page
     width: 480
     height: 200
-    color: "white"
+    color: "LightGrey"
     Text {
         id: HelloText
         text: "Hello world!"
diff --git a/doc/src/images/declarative-tutorial1.png b/doc/src/images/declarative-tutorial1.png
index a936054..ea0000f 100644
--- a/doc/src/images/declarative-tutorial1.png
+++ b/doc/src/images/declarative-tutorial1.png
diff --git a/doc/src/images/declarative-tutorial2.png b/doc/src/images/declarative-tutorial2.png
index 7871589..0538451 100644
--- a/doc/src/images/declarative-tutorial2.png
+++ b/doc/src/images/declarative-tutorial2.png
diff --git a/doc/src/images/declarative-tutorial3_animation.gif b/doc/src/images/declarative-tutorial3_animation.gif
index 0465e61..d2d4c63 100644
--- a/doc/src/images/declarative-tutorial3_animation.gif
+++ b/doc/src/images/declarative-tutorial3_animation.gif