diff --git a/meshroom/ui/qml/Charts/ChartViewLegend.qml b/meshroom/ui/qml/Charts/ChartViewLegend.qml index 52297871..d727c531 100644 --- a/meshroom/ui/qml/Charts/ChartViewLegend.qml +++ b/meshroom/ui/qml/Charts/ChartViewLegend.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtCharts 2.3 +import QtCharts 2.15 /** diff --git a/meshroom/ui/qml/Charts/InteractiveChartView.qml b/meshroom/ui/qml/Charts/InteractiveChartView.qml index e0a6b2cb..f2566bc7 100644 --- a/meshroom/ui/qml/Charts/InteractiveChartView.qml +++ b/meshroom/ui/qml/Charts/InteractiveChartView.qml @@ -2,10 +2,10 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtPositioning 5.8 -import QtLocation 5.9 +import QtPositioning 5.15 +import QtLocation 5.15 -import QtCharts 2.13 +import QtCharts 2.15 import Controls 1.0 import Utils 1.0 diff --git a/meshroom/ui/qml/GraphEditor/Node.qml b/meshroom/ui/qml/GraphEditor/Node.qml index 02cd4754..2f942694 100755 --- a/meshroom/ui/qml/GraphEditor/Node.qml +++ b/meshroom/ui/qml/GraphEditor/Node.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.12 import Utils 1.0 import MaterialIcons 2.2 diff --git a/meshroom/ui/qml/GraphEditor/StatViewer.qml b/meshroom/ui/qml/GraphEditor/StatViewer.qml index 26b3c876..0e307893 100644 --- a/meshroom/ui/qml/GraphEditor/StatViewer.qml +++ b/meshroom/ui/qml/GraphEditor/StatViewer.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtCharts 2.2 +import QtCharts 2.15 import QtQuick.Layouts 1.11 import Utils 1.0 import Charts 1.0 diff --git a/meshroom/ui/qml/ImageGallery/ImageGallery.qml b/meshroom/ui/qml/ImageGallery/ImageGallery.qml index a11d7a67..f81c997d 100644 --- a/meshroom/ui/qml/ImageGallery/ImageGallery.qml +++ b/meshroom/ui/qml/ImageGallery/ImageGallery.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtQml.Models 2.2 +import QtQml.Models 2.15 import Qt.labs.qmlmodels 1.0 import Controls 1.0 diff --git a/meshroom/ui/qml/Utils/SortFilterDelegateModel.qml b/meshroom/ui/qml/Utils/SortFilterDelegateModel.qml index 447d855b..aacb01a9 100644 --- a/meshroom/ui/qml/Utils/SortFilterDelegateModel.qml +++ b/meshroom/ui/qml/Utils/SortFilterDelegateModel.qml @@ -1,5 +1,5 @@ -import QtQml.Models 2.2 import QtQuick 2.15 +import QtQml.Models 2.15 import QtQuick.Controls 2.15 /** diff --git a/meshroom/ui/qml/Viewer/CameraResponseGraph.qml b/meshroom/ui/qml/Viewer/CameraResponseGraph.qml index 7a7a489a..88b8608a 100644 --- a/meshroom/ui/qml/Viewer/CameraResponseGraph.qml +++ b/meshroom/ui/qml/Viewer/CameraResponseGraph.qml @@ -2,9 +2,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtPositioning 5.8 -import QtLocation 5.9 -import QtCharts 2.13 +import QtPositioning 5.15 +import QtLocation 5.15 +import QtCharts 2.15 import Charts 1.0 import Controls 1.0 diff --git a/meshroom/ui/qml/Viewer/ImageMetadataView.qml b/meshroom/ui/qml/Viewer/ImageMetadataView.qml index 8bc3c032..e878be4f 100644 --- a/meshroom/ui/qml/Viewer/ImageMetadataView.qml +++ b/meshroom/ui/qml/Viewer/ImageMetadataView.qml @@ -2,8 +2,8 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtPositioning 5.8 -import QtLocation 5.9 +import QtPositioning 5.15 +import QtLocation 5.15 import Controls 1.0 import Utils 1.0 @@ -267,7 +267,7 @@ FloatingPane { Connections { target: root - onCoordinatesChanged: recenter() + function onCoordinatesChanged() { recenter() } } zoomLevel: 16 diff --git a/meshroom/ui/qml/Viewer/SfmGlobalStats.qml b/meshroom/ui/qml/Viewer/SfmGlobalStats.qml index 841f5808..ed50dd54 100644 --- a/meshroom/ui/qml/Viewer/SfmGlobalStats.qml +++ b/meshroom/ui/qml/Viewer/SfmGlobalStats.qml @@ -2,9 +2,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtPositioning 5.8 -import QtLocation 5.9 -import QtCharts 2.13 +import QtPositioning 5.15 +import QtLocation 5.15 +import QtCharts 2.15 import Charts 1.0 import Controls 1.0 diff --git a/meshroom/ui/qml/Viewer/SfmStatsView.qml b/meshroom/ui/qml/Viewer/SfmStatsView.qml index 7a402242..62863409 100644 --- a/meshroom/ui/qml/Viewer/SfmStatsView.qml +++ b/meshroom/ui/qml/Viewer/SfmStatsView.qml @@ -2,9 +2,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import MaterialIcons 2.2 -import QtPositioning 5.8 -import QtLocation 5.9 -import QtCharts 2.13 +import QtPositioning 5.15 +import QtLocation 5.15 +import QtCharts 2.15 import Charts 1.0 import Controls 1.0 diff --git a/meshroom/ui/qml/Viewer3D/Viewer3D.qml b/meshroom/ui/qml/Viewer3D/Viewer3D.qml index 6162e9d7..588b583e 100644 --- a/meshroom/ui/qml/Viewer3D/Viewer3D.qml +++ b/meshroom/ui/qml/Viewer3D/Viewer3D.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Controls 1.4 as Controls1 import QtQuick.Layouts 1.11 -import QtQml.Models 2.2 +import QtQml.Models 2.15 import QtQuick.Scene3D 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml index cedd07b4..f92bbd90 100644 --- a/meshroom/ui/qml/main.qml +++ b/meshroom/ui/qml/main.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import QtQuick.Controls 1.4 as Controls1 // For SplitView import QtQuick.Layouts 1.11 import QtQuick.Window 2.15 -import QtQml.Models 2.2 +import QtQml.Models 2.15 import Qt.labs.platform 1.0 as Platform import QtQuick.Dialogs 1.3