Fix up examples.

- Remove dependencies from examples
- Remove stray copies of qtc_packaging
- remove .desktop files
- rename examples (to their old name)

Reviewed-By: Casper van Donderen

4 files changed, 15 insertions, 32 deletions

diff --git a/examples/declarative/modelviews/parallax/parallax.desktop b/examples/declarative/modelviews/parallax/parallax.desktop
deleted file mode 100644
index c3d8cfc..0000000
--- a/examples/declarative/modelviews/parallax/parallax.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=parallax
-Exec=/opt/parallax/bin/parallax
-Icon=parallax64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/parallax/parallax_harmattan.desktop b/examples/declarative/modelviews/parallax/parallax_harmattan.desktop
deleted file mode 100644
index 2fff255..0000000
--- a/examples/declarative/modelviews/parallax/parallax_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=parallax
-Exec=/usr/bin/single-instance /opt/parallax/bin/parallax
-Icon=/usr/share/icons/hicolor/80x80/apps/parallax80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/parallax/qml/parallax/Clock.qml b/examples/declarative/modelviews/parallax/qml/parallax/Clock.qml
new file mode 100644
index 0000000..f378378
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/qml/parallax/Clock.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.1
+
+Text {
+    Timer {
+        triggeredOnStart: true
+        onTriggered: parent.text = Qt.formatTime(new Date())
+        interval: 1000; running: visible; repeat: true;
+    }
+
+    font.pixelSize: 32
+    font.family: "sans-serif"
+    font.bold: true
+    color: "white"
+}
diff --git a/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml b/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
index c518910..68219fe 100644
--- a/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
+++ b/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
@@ -39,8 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 1.0
-import "../../../../toys/clocks/content"  // for loading the Clock element
-//import "qml"
 
 Rectangle {
     width: 320; height: 480
@@ -65,14 +63,7 @@ Rectangle {
         Item {
             property url icon: "pics/yast-joystick.png"
             width: 320; height: 480
-
-            Loader {
-                anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
-                width: 300; height: 400
-                clip: true; 
-                source: "../../../../../../demos/declarative/samegame/samegame.qml"
-                Component.onCompleted: item.inAnotherDemo = true;
-            }
+            Image { anchors.centerIn: parent; source: "pics/samegame.png" }
         }
     }
 }