summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2016-10-31 15:28:01 +0200
committerAntti Määttä <antti.maatta@qt.io>2017-01-26 12:08:09 +0000
commit57a25953d4cba3c3a5262edf8f6094d746d24748 (patch)
treeba61723af14ef23719b475a9ff7faab843f68d1a
parent5fb7611e5fac37739668d657642f5efd52797d96 (diff)
Update render-qml-to-texture test
Use inline qml Change-Id: I3a4ceb82a9e8d4478bdbb71ca400bb81ab6ccad2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--tests/manual/render-qml-to-texture-qml/main.qml9
-rw-r--r--tests/manual/render-qml-to-texture/OffscreenGui.qml3
-rw-r--r--tests/manual/render-qml-to-texture/render-qml-to-texture.pri6
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/manual/render-qml-to-texture-qml/main.qml b/tests/manual/render-qml-to-texture-qml/main.qml
index 1551065c8..3c1ee61d8 100644
--- a/tests/manual/render-qml-to-texture-qml/main.qml
+++ b/tests/manual/render-qml-to-texture-qml/main.qml
@@ -49,9 +49,10 @@ QQ2.Item {
Scene3D {
id: scene
+ focus: true
anchors.fill: parent
- aspects: ["input"]
+ aspects: ["input", "logic"]
Entity {
id: sceneRoot
@@ -70,7 +71,6 @@ QQ2.Item {
Scene2D {
id: qmlTexture
- source: "qrc:/OffscreenGui.qml"
renderOnce: false
output: RenderTargetOutput {
attachmentPoint: RenderTargetOutput.Color0
@@ -88,8 +88,9 @@ QQ2.Item {
}
}
}
- onLoadedChanged: {
- console.log("qmlTexture loaded:" + loaded)
+
+ OffscreenGui {
+
}
}
diff --git a/tests/manual/render-qml-to-texture/OffscreenGui.qml b/tests/manual/render-qml-to-texture/OffscreenGui.qml
index 2e18a1e7a..20fb0937d 100644
--- a/tests/manual/render-qml-to-texture/OffscreenGui.qml
+++ b/tests/manual/render-qml-to-texture/OffscreenGui.qml
@@ -38,9 +38,10 @@ import QtQuick 2.0
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.3
-Item {
+Rectangle {
width: 1024
height: 1024
+ color: "white"
TextRectangle {
id: textRect
diff --git a/tests/manual/render-qml-to-texture/render-qml-to-texture.pri b/tests/manual/render-qml-to-texture/render-qml-to-texture.pri
index c0685debc..b02c23840 100644
--- a/tests/manual/render-qml-to-texture/render-qml-to-texture.pri
+++ b/tests/manual/render-qml-to-texture/render-qml-to-texture.pri
@@ -1,8 +1,6 @@
-SOURCES += \
- ../render-qml-to-texture/keyframeanimation.cpp
+SOURCES +=
RESOURCES += \
../render-qml-to-texture/render-qml-to-texture.qrc
-HEADERS += \
- ../render-qml-to-texture/keyframeanimation.h
+HEADERS +=