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

3 files changed, 32 insertions, 1 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 7a4e51c..7a9de60 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -849,6 +849,7 @@ Item {
 \endcode
 
 \section1 Defining new Components
+\target components
 
 A component is a reusable type with a well-defined interface built entirely in
 QML.  Components appear as regular QML elements, and can be used interchangably
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 06f6bdc..a39d858 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -122,7 +122,6 @@ This function plays the audio file located at \c soundLocation. Only .wav files
 
 \section3 Qt.openUrlExternally(url target)
 This function attempts to open the specified \c target url in an external application, based on the user's desktop preferences. It will return true if it succeeds, and false otherwise.
-\endlist
 
 \section1 Dynamic Object Creation
 The following functions on the global object allow you to dynamically create QML
diff --git a/doc/src/snippets/declarative/border-image.qml b/doc/src/snippets/declarative/border-image.qml
new file mode 100644
index 0000000..c4215cd
--- /dev/null
+++ b/doc/src/snippets/declarative/border-image.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 520; height: 280
+
+    Row {
+        anchors.centerIn: parent
+        spacing: 50
+//! [0]
+        BorderImage {
+            width: 180; height: 180
+            border.left: 30; border.top: 30
+            border.right: 30; border.bottom: 30
+            horizontalTileMode: BorderImage.Stretch
+            verticalTileMode: BorderImage.Stretch
+            source: "content/colors.png"
+        }
+
+        BorderImage {
+            width: 180; height: 180
+            border.left: 30; border.top: 30
+            border.right: 30; border.bottom: 30
+            horizontalTileMode: BorderImage.Round
+            verticalTileMode: BorderImage.Round
+            source: "content/colors.png"
+        }
+//! [0]
+    }
+}