Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/painting/qpainter.cpp
	src/gui/text/qtextengine.cpp
	tests/auto/qimage/tst_qimage.cpp
	tests/auto/qpainter/tst_qpainter.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
	tools/qdoc3/test/qt.qdocconf

1 files changed, 15 insertions, 2 deletions

diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 46114f5..b1344af 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -208,17 +208,30 @@ Rectangle {
     Keys.onUpPressed: if (state == "starting" || direction != 2) Logic.scheduleDirection(0);
     Keys.onDownPressed: if (state == "starting" || direction != 0) Logic.scheduleDirection(2);
 
+    Connections {
+        target: startHeartbeatTimer
+        onRunningChanged: {
+            if (startHeartbeatTimer.running)
+                screen.state = "starting";
+            else
+                screen.state = "running"
+        }
+    }
+    Connections {
+        target: heartbeat
+        onRunningChanged: if (!heartbeat.running) screen.state = "";
+    }
+
+
     states: [
         State {
             name: "starting"
-            when: startHeartbeatTimer.running
             PropertyChanges {target: progressIndicator; width: 200}
             PropertyChanges {target: title; opacity: 0}
             PropertyChanges {target: progressBar; opacity: 1}
         },
         State {
             name: "running"
-            when: (heartbeat.running && !startHeartbeatTimer.running)
             PropertyChanges {target: progressIndicator; width: 200}
             PropertyChanges {target: title; opacity: 0}
             PropertyChanges {target: skull; row: 0; column: 0; }