From b14129a6c29f6096b6f89665d8c0b40e25e9ba72 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Mon, 3 Aug 2020 21:21:48 +0200 Subject: [PATCH] [qml] update import QtQuick to 2.15 --- meshroom/ui/qml/Controls/Group.qml | 2 +- meshroom/ui/qml/GraphEditor/GraphEditor.qml | 2 +- meshroom/ui/qml/GraphEditor/NodeChunks.qml | 2 +- meshroom/ui/qml/GraphEditor/StatViewer.qml | 2 +- meshroom/ui/qml/ImageGallery/ImageGallery.qml | 2 +- meshroom/ui/qml/Viewer/TestAliceVisionPlugin.qml | 2 +- meshroom/ui/qml/Viewer/TestOIIOPlugin.qml | 2 +- meshroom/ui/qml/Viewer/Viewer2D.qml | 2 +- meshroom/ui/qml/Viewer3D/DefaultCameraController.qml | 2 +- meshroom/ui/qml/Viewer3D/Grid3D.qml | 2 +- meshroom/ui/qml/Viewer3D/Inspector3D.qml | 2 +- meshroom/ui/qml/Viewer3D/Locator3D.qml | 2 +- meshroom/ui/qml/Viewer3D/Viewer3D.qml | 2 +- meshroom/ui/qml/WorkspaceView.qml | 2 +- meshroom/ui/qml/main.qml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meshroom/ui/qml/Controls/Group.qml b/meshroom/ui/qml/Controls/Group.qml index 452c9cdd..e1b81120 100644 --- a/meshroom/ui/qml/Controls/Group.qml +++ b/meshroom/ui/qml/Controls/Group.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import MaterialIcons 2.2 diff --git a/meshroom/ui/qml/GraphEditor/GraphEditor.qml b/meshroom/ui/qml/GraphEditor/GraphEditor.qml index b87fc085..cd0af9ae 100755 --- a/meshroom/ui/qml/GraphEditor/GraphEditor.qml +++ b/meshroom/ui/qml/GraphEditor/GraphEditor.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import Controls 1.0 diff --git a/meshroom/ui/qml/GraphEditor/NodeChunks.qml b/meshroom/ui/qml/GraphEditor/NodeChunks.qml index b6842092..11af84df 100644 --- a/meshroom/ui/qml/GraphEditor/NodeChunks.qml +++ b/meshroom/ui/qml/GraphEditor/NodeChunks.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import "common.js" as Common diff --git a/meshroom/ui/qml/GraphEditor/StatViewer.qml b/meshroom/ui/qml/GraphEditor/StatViewer.qml index 4674e23a..46ab7fb9 100644 --- a/meshroom/ui/qml/GraphEditor/StatViewer.qml +++ b/meshroom/ui/qml/GraphEditor/StatViewer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtCharts 2.2 import QtQuick.Layouts 1.11 diff --git a/meshroom/ui/qml/ImageGallery/ImageGallery.qml b/meshroom/ui/qml/ImageGallery/ImageGallery.qml index 64fc769c..a572e19c 100644 --- a/meshroom/ui/qml/ImageGallery/ImageGallery.qml +++ b/meshroom/ui/qml/ImageGallery/ImageGallery.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import MaterialIcons 2.2 diff --git a/meshroom/ui/qml/Viewer/TestAliceVisionPlugin.qml b/meshroom/ui/qml/Viewer/TestAliceVisionPlugin.qml index 4b40ee5e..17045c04 100644 --- a/meshroom/ui/qml/Viewer/TestAliceVisionPlugin.qml +++ b/meshroom/ui/qml/Viewer/TestAliceVisionPlugin.qml @@ -1,5 +1,5 @@ import AliceVision 1.0 -import QtQuick 2.7 +import QtQuick 2.15 /** * To evaluate if the QtAliceVision plugin is available. diff --git a/meshroom/ui/qml/Viewer/TestOIIOPlugin.qml b/meshroom/ui/qml/Viewer/TestOIIOPlugin.qml index 7fde5b45..c1dfd840 100644 --- a/meshroom/ui/qml/Viewer/TestOIIOPlugin.qml +++ b/meshroom/ui/qml/Viewer/TestOIIOPlugin.qml @@ -1,5 +1,5 @@ import DepthMapEntity 2.1 -import QtQuick 2.7 +import QtQuick 2.15 /** * To evaluate if the QtOIIO plugin is available. diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml index 69efd6a9..972f032e 100644 --- a/meshroom/ui/qml/Viewer/Viewer2D.qml +++ b/meshroom/ui/qml/Viewer/Viewer2D.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import MaterialIcons 2.2 diff --git a/meshroom/ui/qml/Viewer3D/DefaultCameraController.qml b/meshroom/ui/qml/Viewer3D/DefaultCameraController.qml index 8a01ab6d..ce52b693 100644 --- a/meshroom/ui/qml/Viewer3D/DefaultCameraController.qml +++ b/meshroom/ui/qml/Viewer3D/DefaultCameraController.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 import Qt3D.Input 2.15 diff --git a/meshroom/ui/qml/Viewer3D/Grid3D.qml b/meshroom/ui/qml/Viewer3D/Grid3D.qml index a4beabd7..f636d8a8 100644 --- a/meshroom/ui/qml/Viewer3D/Grid3D.qml +++ b/meshroom/ui/qml/Viewer3D/Grid3D.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 import Qt3D.Extras 2.15 diff --git a/meshroom/ui/qml/Viewer3D/Inspector3D.qml b/meshroom/ui/qml/Viewer3D/Inspector3D.qml index ee372e71..a770c40b 100644 --- a/meshroom/ui/qml/Viewer3D/Inspector3D.qml +++ b/meshroom/ui/qml/Viewer3D/Inspector3D.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import MaterialIcons 2.2 diff --git a/meshroom/ui/qml/Viewer3D/Locator3D.qml b/meshroom/ui/qml/Viewer3D/Locator3D.qml index f21fb463..f9bb1fb4 100644 --- a/meshroom/ui/qml/Viewer3D/Locator3D.qml +++ b/meshroom/ui/qml/Viewer3D/Locator3D.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 import Qt3D.Extras 2.15 diff --git a/meshroom/ui/qml/Viewer3D/Viewer3D.qml b/meshroom/ui/qml/Viewer3D/Viewer3D.qml index 43f31eb9..c3dfa20c 100644 --- a/meshroom/ui/qml/Viewer3D/Viewer3D.qml +++ b/meshroom/ui/qml/Viewer3D/Viewer3D.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Controls 1.4 as Controls1 import QtQuick.Layouts 1.3 diff --git a/meshroom/ui/qml/WorkspaceView.qml b/meshroom/ui/qml/WorkspaceView.qml index 3ce1b585..0965b15b 100644 --- a/meshroom/ui/qml/WorkspaceView.qml +++ b/meshroom/ui/qml/WorkspaceView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Controls 1.4 as Controls1 // For SplitView import QtQuick.Layouts 1.3 diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml index caaec7ab..fcf42da1 100755 --- a/meshroom/ui/qml/main.qml +++ b/meshroom/ui/qml/main.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.15 import QtQuick.Controls 2.3 import QtQuick.Controls 1.4 as Controls1 // For SplitView import QtQuick.Layouts 1.1