Skip to content

Q
qgroundcontrol
Unverified Commit 59a429d3 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7545 from mavlink/QtQuickControls2 

QtQuick.Controls 2.4
parents 7cd8d281 6e07b11e
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 56 deletions
src/FlightDisplay/FlightDisplayViewMap.qml
View file @ 59a429d3
......@@ -8,11 +8,11 @@
****************************************************************************/
import QtQuick 2.4
import QtQuick.Controls 1.2
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QGroundControl 1.0
import QGroundControl.Airspace 1.0
......@@ -176,10 +176,6 @@ FlightMap {
}
}
ExclusiveGroup {
id: _mapTypeButtonsExclusiveGroup
}
MapFitFunctions {
id: mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware!
map: mainWindow.flightDisplayMap
......
src/MissionManager/QGCMapPolygonVisuals.qml
View file @ 59a429d3
......@@ -7,11 +7,11 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
......
src/MissionManager/QGCMapPolylineVisuals.qml
View file @ 59a429d3
......@@ -7,11 +7,11 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtLocation 5.3
import QtPositioning 5.3
import QtQuick.Dialogs 1.2
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
......
src/PlanView/MissionItemEditor.qml
View file @ 59a429d3
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQml 2.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQml 2.2
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
......
src/PlanView/PlanView.qml
View file @ 59a429d3
......@@ -264,12 +264,6 @@ Item {
}
}
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
ExclusiveGroup {
id: _mapTypeButtonsExclusiveGroup
}
/// Inserts a new simple mission item
/// @param coordinate Location to insert item
/// @param index Insert item at this index
......@@ -1031,7 +1025,7 @@ Item {
}
QGCButton {
text: qsTr("Save Mission Waypoints As KML...")
text: qsTr("Save Mission Waypoints As KML...")
Layout.columnSpan: 2
enabled: !_planMasterController.syncInProgress && _visualItems.count > 1
onClicked: {
......
src/PlanView/RallyPointItemEditor.qml
View file @ 59a429d3
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
......
src/PlanView/SimpleItemEditor.qml
View file @ 59a429d3
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.11
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
......
src/QmlControls/FlightModeMenu.qml
View file @ 59a429d3
......@@ -7,8 +7,8 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QGroundControl 1.0
import QGroundControl.Controls 1.0
......
src/QmlControls/ParameterEditor.qml
View file @ 59a429d3
......@@ -7,10 +7,10 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11
import QGroundControl 1.0
import QGroundControl.Controls 1.0
......
src/QmlControls/QGCFileDialog.qml
View file @ 59a429d3
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
......
src/QmlControls/QmlTest.qml
View file @ 59a429d3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.2
import QtQuick.Layouts 1.11
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
......
src/ui/toolbar/LinkIndicator.qml
View file @ 59a429d3
......@@ -8,8 +8,8 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QGroundControl 1.0
import QGroundControl.Controls 1.0
......
src/ui/toolbar/ModeIndicator.qml
View file @ 59a429d3
......@@ -8,8 +8,8 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QGroundControl 1.0
import QGroundControl.Controls 1.0
......
src/ui/toolbar/MultiVehicleSelector.qml
View file @ 59a429d3
......@@ -8,8 +8,8 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick 2.11
import QtQuick.Controls 2.4
import QGroundControl 1.0
import QGroundControl.Controls 1.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment