Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

4 files changed, 0 insertions, 81 deletions

diff --git a/examples/declarative/effects/effects.qml b/examples/declarative/effects/effects.qml
deleted file mode 100644
index feb7c69..0000000
--- a/examples/declarative/effects/effects.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 400; height: 200
-
-    Image {
-        id: blur
-        x: 5
-        source: "pic.png"
-
-        effect: Blur {
-            NumberAnimation on blurRadius {
-                id: blurEffect
-                running: false
-                from: 0; to: 10
-                duration: 1000
-                loops: Animation.Infinite
-            }
-        }
-
-        MouseArea { anchors.fill: parent; onClicked: blurEffect.running = !blurEffect.running }
-    }
-
-    Text { text: "Blur"; anchors.top: blur.bottom; anchors.horizontalCenter: blur.horizontalCenter }
-
-    Image {
-        id: dropShadow
-        source: "pic.png"
-        x: 135
-
-        effect: DropShadow {
-            blurRadius: 3
-            offset.x: 3
-
-            NumberAnimation on offset.y {
-                id: dropShadowEffect
-                from: 0; to: 10
-                duration: 1000
-                running: false
-                loops: Animation.Infinite
-            }
-        }
-
-        MouseArea { anchors.fill: parent; onClicked: dropShadowEffect.running = !dropShadowEffect.running }
-    }
-
-    Image {
-        id: colorize
-        source: "pic.png"
-        x: 265
-
-        effect: Colorize { color: "blue" }
-    }
-
-    Text { text: "Colorize"; anchors.top: colorize.bottom; anchors.horizontalCenter: colorize.horizontalCenter }
-
-    Text { text: "Drop Shadow"; anchors.top: dropShadow.bottom; anchors.horizontalCenter: dropShadow.horizontalCenter }
-
-    Text {
-        y: 155; anchors.horizontalCenter: parent.horizontalCenter
-        text: "Clicking Blur or Drop Shadow will \ntoggle animation."
-        color: "black"
-    }
-
-}
diff --git a/examples/declarative/effects/effects.qmlproject b/examples/declarative/effects/effects.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/effects/effects.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/effects/pic.png b/examples/declarative/effects/pic.png
deleted file mode 100644
index 051e738..0000000
--- a/examples/declarative/effects/pic.png
+++ /dev/null
diff --git a/examples/declarative/tic-tac-toe/content/pics/board.png b/examples/declarative/tic-tac-toe/content/pics/board.png
index 29118a9..7e5b7ba 100644
--- a/examples/declarative/tic-tac-toe/content/pics/board.png
+++ b/examples/declarative/tic-tac-toe/content/pics/board.png