Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Conflicts:
	src/quick/items/qquickopenglshadereffectnode.cpp
	src/quick/items/qquickshadereffect.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
	src/quick/scenegraph/qsgdefaultglyphnode_p.h

Change-Id: I3d6874b4e4231a89d2836c04fe8e7f2ef2d698c4

7 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/controlFromJS.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/controlFromJS.qml
index d1db2af367..dd7cb2055d 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/controlFromJS.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/controlFromJS.qml
@@ -26,10 +26,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQml 2.0
 
-Rectangle {
-    Timer {
+QtObject {
+    property var timer: Timer {
         running: true
         interval: 1
         onTriggered: {
@@ -38,7 +38,7 @@ Rectangle {
         }
     }
 
-    Timer {
+    property var stopTimer: Timer {
         id: stopTimer
         interval: 1000
         onTriggered: {
@@ -47,7 +47,7 @@ Rectangle {
         }
     }
 
-    Timer {
+    property var endTimer: Timer {
         id: endTimer
         interval: 1000
         onTriggered: Qt.quit();
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/exit.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/exit.qml
index b250524caa..4236d70ea3 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/exit.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/exit.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQml 2.0
 
-Item {
+QtObject {
     Timer {
         running: true
         interval: 1
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/javascript.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/javascript.qml
index 0555d49652..e25c7524f4 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/javascript.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/javascript.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQml 2.0
 
-Rectangle {
+QtObject {
     function something(i) {
         if (i > 10) {
             something(i / 4);
@@ -9,8 +9,8 @@ Rectangle {
         }
     }
 
-    width: 400
-    height: 400
+    property int width: 400
+    property int height: 400
 
     onWidthChanged: something(width);
     Component.onCompleted: width = 500;
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml
index 25e63669c4..0eff9e9030 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.0
+import QtQml 2.0
 
-Rectangle {
-    width: 400
-    height: 400
+QtObject {
+    property int width: 400
+    property int height: 400
 
     onWidthChanged: console.log(width);
     Component.onCompleted: width = 500;
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/test.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/test.qml
index 9c36e13c5b..5dd5caf12f 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/test.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/test.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.0
+import QtQml 2.0
 
-Item {
+QtObject {
 
 }
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/timer.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/timer.qml
index 18b8947172..4af555a27b 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/data/timer.qml
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/timer.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.0
+import QtQml 2.0
 
-Rectangle {
-    width: 100
-    height: 62
+QtObject {
+    property int width: 100
+    property int height: 62
 
-    Timer {
+    property var timer: Timer {
         running: true
         repeat: true
         interval: 50
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 2187383a31..c1de5ff594 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -663,11 +663,11 @@ void tst_QQmlProfilerService::signalSourceLocation()
                               QLatin1String("signalSourceLocation.qml"));
     expected.line = 8;
     expected.column = 28;
-    VERIFY(MessageListQML, 13, expected, CheckAll);
+    VERIFY(MessageListQML, 9, expected, CheckAll);
 
     expected.line = 7;
     expected.column = 21;
-    VERIFY(MessageListQML, 15, expected, CheckAll);
+    VERIFY(MessageListQML, 11, expected, CheckAll);
 }
 
 void tst_QQmlProfilerService::javascript()