Merge branch 'master' into animation-refactorwip/animation-refactor

Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504

1 files changed, 0 insertions, 32 deletions

diff --git a/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml b/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml
deleted file mode 100644
index 2692abb82e..0000000000
--- a/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    id: root
-    Component.onCompleted: {
-        var a = [1, 2]
-        var b = {a: "hello", d: 1 }
-        var c
-        var d = 12
-        var e = function() { return 5;}
-        var f = true
-        var g = {toString: function() { throw new Error('toString'); }}
-
-
-        console.log("completed", "ok")
-        console.log("completed ok")
-        console.debug("completed ok")
-        console.warn("completed ok")
-        console.error("completed ok")
-        console.log(a)
-        console.log(b)
-        console.log(c)
-        console.log(d)
-        console.log(e)
-        console.log(f)
-        console.log(root)
-        console.log(g)
-        console.log(1, "pong!", new Object)
-        console.log(1, ["ping","pong"], new Object, 2)
-        console.log(exception) //This has to be at the end
-    }
-}