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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene

3 files changed, 15 insertions, 14 deletions

diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 2fde945..1ed60e9 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <categories name="Qt Examples and Demos">
   <demos dirname="." docname="demos" name="Demonstrations">
-    <example filename="declarative/samegame" name="SameGame" executable="false" qml="true"/>
-    <example filename="declarative/flickr" name="Flickr Client" executable="false" qml="true"/>
+    <example filename="declarative/samegame" name="SameGame"/>
+    <example filename="declarative/flickr" name="Flickr Client"/>
     <example filename="affine" name="Affine Transformations" />
     <example filename="composition" name="Composition Modes" />
     <example filename="gradients" name="Gradients" />
@@ -11,8 +11,8 @@
     <example filename="chip" name="40000 Chips" />
     <example filename="embeddeddialogs" name="Embedded Dialogs" />
     <example filename="interview" name="Interview" />
-    <example filename="declarative/rssnews" name="Rss Client" executable="false" qml="true"/>
-    <example filename="declarative/twitter" name="Twitter Client" executable="false" qml="true"/>
+    <example filename="declarative/rssnews" name="Rss Client"/>
+    <example filename="declarative/twitter" name="Twitter Client"/>
     <example filename="browser" name="Browser" />
     <example filename="qmediaplayer" name="Media Player" />
     <example filename="boxes" name="Boxes" />
@@ -41,11 +41,11 @@
     <example filename="wordcount" name="Word Count" executable="false" />
   </category>
   <category dirname="declarative/toys" name="Qt Declarative Examples">
-    <example filename="dynamicscene" name="Dynamic Scene" executable="false" qml="true" />
-    <example filename="tic-tac-toe" name="Tic Tac Toe" executable="false" qml="true" />
-    <example filename="clocks" name="Clocks" executable="false" qml="true" />
-    <example filename="corkboards" name="Corkboards" executable="false" qml="true" />
-    <example filename="tvtennis" name="TV Tennis" executable="false" qml="true" />
+    <example filename="dynamicscene" name="Dynamic Scene"/>
+    <example filename="tic-tac-toe" name="Tic Tac Toe"/>
+    <example filename="clocks" name="Clocks"/>
+    <example filename="corkboards" name="Corkboards"/>
+    <example filename="tvtennis" name="TV Tennis"/>
   </category>
   <category dirname="designer" name="Qt Designer">
     <example filename="calculatorbuilder" name="Calculator Builder" />
diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml
index 1788e6c..c2846b1 100644
--- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml
+++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml
@@ -146,27 +146,27 @@ Item {
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "Sun.qml"
-                        image: "../images/sun.png"
+                        image: "images/sun.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "GenericSceneItem.qml"
-                        image: "../images/moon.png"
+                        image: "images/moon.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/tree_s.png"
+                        image: "images/tree_s.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_brown.png"
+                        image: "images/rabbit_brown.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_bw.png"
+                        image: "images/rabbit_bw.png"
                     }
                 }
             }
diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
index c81d8f0..4fdb47c 100644
--- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro
+++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
@@ -31,6 +31,7 @@ symbian:TARGET.UID3 = 0xEFDDF868
 # CONFIG += mobility
 # MOBILITY +=
 
+TARGET = tic-tac-toe
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp