From 146928603208a93de472ba736ba0e95e7ac14a9d Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Wed, 24 Apr 2019 13:20:33 +0200 Subject: tst_raycastingjob: update QML import versions Change-Id: Ibcc99251abe27d15af2908154bff5519746a3362 Reviewed-by: Mike Krus --- .../auto/render/raycastingjob/testscene_screenraycasting.qml | 11 ++++++----- tests/auto/render/raycastingjob/testscene_worldraycasting.qml | 9 +++++---- .../raycastingjob/testscene_worldraycastingalllayers.qml | 9 +++++---- .../render/raycastingjob/testscene_worldraycastinglayer.qml | 9 +++++---- .../raycastingjob/testscene_worldraycastingparentlayer.qml | 9 +++++---- 5 files changed, 26 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml index 4ad696d49..47221aec8 100644 --- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml @@ -48,11 +48,12 @@ ** ****************************************************************************/ -import Qt3D.Core 2.0 -import Qt3D.Render 2.11 -import Qt3D.Extras 2.0 -import QtQuick.Window 2.0 -import Qt3D.Input 2.0 +import QtQml 2.14 +import Qt3D.Core 2.14 +import Qt3D.Render 2.14 +import Qt3D.Input 2.14 +import Qt3D.Extras 2.14 +import QtQuick.Window 2.14 Entity { id: sceneRoot diff --git a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml index 159c8b515..cdb6b9234 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml @@ -48,10 +48,11 @@ ** ****************************************************************************/ -import Qt3D.Core 2.0 -import Qt3D.Render 2.11 -import Qt3D.Extras 2.0 -import QtQuick.Window 2.0 +import QtQml 2.14 +import Qt3D.Core 2.14 +import Qt3D.Render 2.14 +import Qt3D.Extras 2.14 +import QtQuick.Window 2.14 Entity { id: sceneRoot diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml index c88ffab36..efcc31e8f 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml @@ -48,10 +48,11 @@ ** ****************************************************************************/ -import Qt3D.Core 2.0 -import Qt3D.Render 2.11 -import Qt3D.Extras 2.0 -import QtQuick.Window 2.0 +import QtQml 2.14 +import Qt3D.Core 2.14 +import Qt3D.Render 2.14 +import Qt3D.Extras 2.14 +import QtQuick.Window 2.14 Entity { id: sceneRoot diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml index f561dcf49..5c6170ae6 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -48,10 +48,11 @@ ** ****************************************************************************/ -import Qt3D.Core 2.0 -import Qt3D.Render 2.11 -import Qt3D.Extras 2.0 -import QtQuick.Window 2.0 +import QtQml 2.14 +import Qt3D.Core 2.14 +import Qt3D.Render 2.14 +import Qt3D.Extras 2.14 +import QtQuick.Window 2.14 Entity { id: sceneRoot diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml index 5322030b7..99ca26d6f 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml @@ -48,10 +48,11 @@ ** ****************************************************************************/ -import Qt3D.Core 2.0 -import Qt3D.Render 2.11 -import Qt3D.Extras 2.0 -import QtQuick.Window 2.0 +import QtQml 2.14 +import Qt3D.Core 2.14 +import Qt3D.Render 2.14 +import Qt3D.Extras 2.14 +import QtQuick.Window 2.14 Entity { id: sceneRoot -- cgit v1.2.3