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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Tic-tac-toe: Fix z-order of status text.
  Don't export QtDeclarative symbols needed by QtCreator on Symbian
  Properties take precedence over methods
  Call the correct vme meta object when connecting alias signals
  Fix Twitter demo's list view for devices
  Fix QDeclarativeTextLayout under non-affine transformation
  Fix visual tests.
  ListView.visibleArea.heightRatio should not emit a signal when it does not change.
  Properties should have precedence over methods.

1 files changed, 18 insertions, 16 deletions

diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
index 4c1ad51..c60f2df 100644
--- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
@@ -55,22 +55,6 @@ Rectangle {
         source: "content/pics/board.png"
     }
 
-    Text {
-        id: messageDisplay
-        anchors.centerIn: parent
-        color: "blue"
-        style: Text.Outline; styleColor: "white"
-        font.pixelSize: 50; font.bold: true
-        visible: false
-
-        Timer {
-            running: messageDisplay.visible
-            onTriggered: { 
-                messageDisplay.visible = false;
-                Logic.restartGame();
-            }
-        }
-    }
 
     Column {
         id: display
@@ -118,4 +102,22 @@ Rectangle {
             }
         }
     }
+
+
+    Text {
+        id: messageDisplay
+        anchors.centerIn: parent
+        color: "blue"
+        style: Text.Outline; styleColor: "white"
+        font.pixelSize: 50; font.bold: true
+        visible: false
+
+        Timer {
+            running: messageDisplay.visible
+            onTriggered: {
+                messageDisplay.visible = false;
+                Logic.restartGame();
+            }
+        }
+    }
 }