diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
| commit | 2dd6aa017685bd76f3a315871d07fdaef0e6d5f1 (patch) | |
| tree | 3ee522501db89ab9d295bd169298497c0d86309e /tests/manual/video-texture-qml/main.qml | |
| parent | 06fa003da1dc6bc16616f3e687de8513d8b40a1c (diff) | |
| parent | cadfd44c77de9ad3d66e936df140e4ba6efb0d74 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
Diffstat (limited to 'tests/manual/video-texture-qml/main.qml')
| -rw-r--r-- | tests/manual/video-texture-qml/main.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/video-texture-qml/main.qml b/tests/manual/video-texture-qml/main.qml index 6a8dff3d5..93110ef2a 100644 --- a/tests/manual/video-texture-qml/main.qml +++ b/tests/manual/video-texture-qml/main.qml @@ -40,7 +40,7 @@ import Qt3D.Input 2.0 import QtQuick 2.2 as QQ2 import QtQuick.Scene2D 2.9 import QtQuick.Window 2.0 as QW2 -import Qt3D.Extras 2.0 +import Qt3D.Extras 2.9 import QtMultimedia 5.6 as QMM import QtQuick.Dialogs 1.0 @@ -121,7 +121,7 @@ Entity { translation: Qt.vector3d(0,0,0) } - property Material material: PlaneMaterial { + property Material material: TextureMaterial { texture: offscreenTexture } |