mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-07-27 05:27:28 +02:00
[qml] Qt5.15: Upgrade all remaining modules
The upgrade concerns the following modules: - QtCharts - QtPositioning - QtLocation - QtGraphicalEffects - QtQml
This commit is contained in:
parent
423de8ccfe
commit
62ba08447d
12 changed files with 22 additions and 22 deletions
|
@ -1,6 +1,6 @@
|
||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtCharts 2.3
|
import QtCharts 2.15
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -2,10 +2,10 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtPositioning 5.8
|
import QtPositioning 5.15
|
||||||
import QtLocation 5.9
|
import QtLocation 5.15
|
||||||
|
|
||||||
import QtCharts 2.13
|
import QtCharts 2.15
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
import Utils 1.0
|
import Utils 1.0
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import QtGraphicalEffects 1.0
|
import QtGraphicalEffects 1.12
|
||||||
|
|
||||||
import Utils 1.0
|
import Utils 1.0
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtCharts 2.2
|
import QtCharts 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import Utils 1.0
|
import Utils 1.0
|
||||||
import Charts 1.0
|
import Charts 1.0
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtQml.Models 2.2
|
import QtQml.Models 2.15
|
||||||
import Qt.labs.qmlmodels 1.0
|
import Qt.labs.qmlmodels 1.0
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import QtQml.Models 2.2
|
|
||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
|
import QtQml.Models 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -2,9 +2,9 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtPositioning 5.8
|
import QtPositioning 5.15
|
||||||
import QtLocation 5.9
|
import QtLocation 5.15
|
||||||
import QtCharts 2.13
|
import QtCharts 2.15
|
||||||
import Charts 1.0
|
import Charts 1.0
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
|
|
|
@ -2,8 +2,8 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtPositioning 5.8
|
import QtPositioning 5.15
|
||||||
import QtLocation 5.9
|
import QtLocation 5.15
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
import Utils 1.0
|
import Utils 1.0
|
||||||
|
@ -267,7 +267,7 @@ FloatingPane {
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: root
|
target: root
|
||||||
onCoordinatesChanged: recenter()
|
function onCoordinatesChanged() { recenter() }
|
||||||
}
|
}
|
||||||
|
|
||||||
zoomLevel: 16
|
zoomLevel: 16
|
||||||
|
|
|
@ -2,9 +2,9 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtPositioning 5.8
|
import QtPositioning 5.15
|
||||||
import QtLocation 5.9
|
import QtLocation 5.15
|
||||||
import QtCharts 2.13
|
import QtCharts 2.15
|
||||||
import Charts 1.0
|
import Charts 1.0
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
|
|
|
@ -2,9 +2,9 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import MaterialIcons 2.2
|
import MaterialIcons 2.2
|
||||||
import QtPositioning 5.8
|
import QtPositioning 5.15
|
||||||
import QtLocation 5.9
|
import QtLocation 5.15
|
||||||
import QtCharts 2.13
|
import QtCharts 2.15
|
||||||
import Charts 1.0
|
import Charts 1.0
|
||||||
|
|
||||||
import Controls 1.0
|
import Controls 1.0
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15
|
import QtQuick.Controls 2.15
|
||||||
import QtQuick.Controls 1.4 as Controls1
|
import QtQuick.Controls 1.4 as Controls1
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import QtQml.Models 2.2
|
import QtQml.Models 2.15
|
||||||
import QtQuick.Scene3D 2.15
|
import QtQuick.Scene3D 2.15
|
||||||
import Qt3D.Core 2.15
|
import Qt3D.Core 2.15
|
||||||
import Qt3D.Render 2.15
|
import Qt3D.Render 2.15
|
||||||
|
|
|
@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
|
||||||
import QtQuick.Controls 1.4 as Controls1 // For SplitView
|
import QtQuick.Controls 1.4 as Controls1 // For SplitView
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts 1.11
|
||||||
import QtQuick.Window 2.15
|
import QtQuick.Window 2.15
|
||||||
import QtQml.Models 2.2
|
import QtQml.Models 2.15
|
||||||
|
|
||||||
import Qt.labs.platform 1.0 as Platform
|
import Qt.labs.platform 1.0 as Platform
|
||||||
import QtQuick.Dialogs 1.3
|
import QtQuick.Dialogs 1.3
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue