16 files changed, 12 insertions, 41 deletions
diff --git a/examples/declarative/border-image/animated.qml b/examples/declarative/border-image/animated.qml
index aaaf495..29c02b3 100644
--- a/examples/declarative/border-image/animated.qml
+++ b/examples/declarative/border-image/animated.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import "content"
 
 Rectangle {
     id: page
@@ -8,47 +9,47 @@ Rectangle {
     MyBorderImage {
         x: 20; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
-        source: "colors.png"; margin: 30
+        source: "content/colors.png"; margin: 30
     }
     MyBorderImage {
         x: 270; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
-        source: "colors.png"; margin: 30
+        source: "content/colors.png"; margin: 30
         horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
     }
     MyBorderImage {
         x: 520; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
-        source: "colors.png"; margin: 30
+        source: "content/colors.png"; margin: 30
         horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
     }
     MyBorderImage {
         x: 770; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
-        source: "colors.png"; margin: 30
+        source: "content/colors.png"; margin: 30
         horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
     }
     MyBorderImage {
         x: 20; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
-        source: "bw.png"; margin: 10
+        source: "content/bw.png"; margin: 10
     }
     MyBorderImage {
         x: 270; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
-        source: "bw.png"; margin: 10
+        source: "content/bw.png"; margin: 10
         horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
     }
     MyBorderImage {
         x: 520; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
-        source: "bw.png"; margin: 10
+        source: "content/bw.png"; margin: 10
         horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
     }
     MyBorderImage {
         x: 770; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
-        source: "bw.png"; margin: 10
+        source: "content/bw.png"; margin: 10
         horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
     }
 }
diff --git a/examples/declarative/border-image/borders.qml b/examples/declarative/border-image/borders.qml
index e90abe6..9879416 100644
--- a/examples/declarative/border-image/borders.qml
+++ b/examples/declarative/border-image/borders.qml
@@ -8,11 +8,11 @@ Rectangle {
     BorderImage {
         x: 20; y: 20; width: 230; height: 240
         smooth: true
-        source: "colors-stretch.sci"
+        source: "content/colors-stretch.sci"
     }
     BorderImage {
         x: 270; y: 20; width: 230; height: 240
         smooth: true
-        source: "colors-round.sci"
+        source: "content/colors-round.sci"
     }
 }
diff --git a/examples/declarative/border-image/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index 9eb1270..9eb1270 100644
--- a/examples/declarative/border-image/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
diff --git a/examples/declarative/border-image/bw.png b/examples/declarative/border-image/content/bw.png
index 486eaae..486eaae 100644
--- a/examples/declarative/border-image/bw.png
+++ b/examples/declarative/border-image/content/bw.png
diff --git a/examples/declarative/border-image/colors-round.sci b/examples/declarative/border-image/content/colors-round.sci
index 506f6f5..506f6f5 100644
--- a/examples/declarative/border-image/colors-round.sci
+++ b/examples/declarative/border-image/content/colors-round.sci
diff --git a/examples/declarative/border-image/colors-stretch.sci b/examples/declarative/border-image/content/colors-stretch.sci
index e4989a7..e4989a7 100644
--- a/examples/declarative/border-image/colors-stretch.sci
+++ b/examples/declarative/border-image/content/colors-stretch.sci
diff --git a/examples/declarative/border-image/colors.png b/examples/declarative/border-image/content/colors.png
index dfb62f3..dfb62f3 100644
--- a/examples/declarative/border-image/colors.png
+++ b/examples/declarative/border-image/content/colors.png
diff --git a/examples/declarative/border-image/example.qml b/examples/declarative/border-image/example.qml
deleted file mode 100644
index 25c19d9..0000000
--- a/examples/declarative/border-image/example.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-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: "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: "colors.png"
-        }
-//! [0]
-    }
-}
diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clocks/clocks.qml
index 927adfa..3235153 100644
--- a/examples/declarative/clock/display.qml
+++ b/examples/declarative/clocks/clocks.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import "content"
 
 Rectangle {
     width: childrenRect.width
diff --git a/examples/declarative/clock/Clock.qml b/examples/declarative/clocks/content/Clock.qml
index 636c99f..636c99f 100644
--- a/examples/declarative/clock/Clock.qml
+++ b/examples/declarative/clocks/content/Clock.qml
diff --git a/examples/declarative/clock/background.png b/examples/declarative/clocks/content/background.png
index a885950..a885950 100644
--- a/examples/declarative/clock/background.png
+++ b/examples/declarative/clocks/content/background.png
diff --git a/examples/declarative/clock/center.png b/examples/declarative/clocks/content/center.png
index 7fbd802..7fbd802 100755
--- a/examples/declarative/clock/center.png
+++ b/examples/declarative/clocks/content/center.png
diff --git a/examples/declarative/clock/clock.png b/examples/declarative/clocks/content/clock.png
index 30bc577..30bc577 100755
--- a/examples/declarative/clock/clock.png
+++ b/examples/declarative/clocks/content/clock.png
diff --git a/examples/declarative/clock/hour.png b/examples/declarative/clocks/content/hour.png
index f8061a1..f8061a1 100755
--- a/examples/declarative/clock/hour.png
+++ b/examples/declarative/clocks/content/hour.png
diff --git a/examples/declarative/clock/minute.png b/examples/declarative/clocks/content/minute.png
index 1297ec7..1297ec7 100755
--- a/examples/declarative/clock/minute.png
+++ b/examples/declarative/clocks/content/minute.png
diff --git a/examples/declarative/clock/second.png b/examples/declarative/clocks/content/second.png
index 4aa9fb5..4aa9fb5 100755
--- a/examples/declarative/clock/second.png
+++ b/examples/declarative/clocks/content/second.png