fly/flightgear
1
0
Fork 0
Code Activity

Launcher: fix include of FlightGear module files

Browse source
This commit is contained in:
James Turner 2021-04-04 16:53:45 +01:00
parent 977dd6fd15
commit 4b9f903f8f
84 changed files with 71 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/qml/AddCatalogPanel.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0 as FG
import "."
import FlightGear 1.0
Rectangle {
id: addCatalogPanel

2
src/GUI/qml/AddOns.qml
View file

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/AddOnsDelegate.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: delegateRoot

2
src/GUI/qml/AddOnsHeader.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/AddonsDetailsView.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.4
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Rectangle {
id: root

2
src/GUI/qml/AircraftCompactDelegate.qml
View file

@ -2,8 +2,6 @@ import QtQuick 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

4
src/GUI/qml/AircraftDetailsView.qml
View file

@ -2,11 +2,11 @@ import QtQuick 2.4
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Rectangle {
id: root
color: "white"
color: Style.backgroundColor
property alias aircraftURI: aircraft.uri
MouseArea {

2
src/GUI/qml/AircraftDownloadPanel.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "." // -> forces the qmldir to be loaded
import FlightGear 1.0
Item {
id: root

1
src/GUI/qml/AircraftGridDelegate.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/AircraftListView.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0 as FG
import "."
import FlightGear 1.0
Item {
id: root

1
src/GUI/qml/AircraftPreviewPanel.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "." // -> forces the qmldir to be loaded
Rectangle {
id: root

4
src/GUI/qml/AircraftRating.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root
@ -31,7 +31,7 @@ Item {
model: 5
delegate: Rectangle {
color: ((model.index + 1) <= root.value) ? "#3f3f3f" : "#cfcfcf"
color: ((model.index + 1) <= root.value) ? Style.themeColor : Style.disabledTextColor
width: radius * 2
height: radius * 2
radius: Style.roundRadius

2
src/GUI/qml/AircraftRatingsPanel.qml
View file

@ -2,8 +2,6 @@ import QtQuick 2.2
import FlightGear.Launcher 1.0 as FG
import FlightGear 1.0
import "."
ListHeaderBox
{
id: root

1
src/GUI/qml/AircraftVariantChoice.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.4
import "." // -> forces the qmldir to be loaded
import FlightGear 1.0
import FlightGear.Launcher 1.0

3
src/GUI/qml/AirportEntry.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
import FlightGear.Launcher 1.0
FocusScope
{

2
src/GUI/qml/BackButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/BaseMenuItem.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item
{

2
src/GUI/qml/Button.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Rectangle {
id: root

2
src/GUI/qml/CatalogDelegate.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: delegateRoot

2
src/GUI/qml/CatalogRefreshFailedNotification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
signal dismiss();

2
src/GUI/qml/Checkbox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
property bool checked: false

2
src/GUI/qml/ClickableText.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
id: root

2
src/GUI/qml/DateTimeEdit.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

2
src/GUI/qml/DateTimeValueEdit.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

2
src/GUI/qml/DeleteButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/DidMigrateOfficialCatalogNotification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
signal dismiss();

2
src/GUI/qml/DidMigrateOtherCatalogNotification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
signal dismiss();

2
src/GUI/qml/DoubleSpinbox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

2
src/GUI/qml/DownloadsInDocumentsWarning.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
signal dismiss();

2
src/GUI/qml/DragToReorderButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
property bool canMoveUp: true

2
src/GUI/qml/EnableDisableButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/Environment.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.4
import QtQml 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
Binding {

2
src/GUI/qml/FavouriteToggleButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

7
src/GUI/qml/FirstRun.qml
View file

@ -1,9 +1,8 @@
import QtQuick 2.4
import QtQuick.Controls 2.2
import QtQuick.Controls 2.2 as QQC
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
import FlightGear.Launcher 1.0
Item {
id: root
@ -21,7 +20,7 @@ Item {
contentHeight: textColumn.childrenRect.height + imageClipFrame.height + (Style.strutSize * 2)
flickableDirection: Flickable.VerticalFlick
ScrollBar.vertical: ScrollBar {}
QQC.ScrollBar.vertical: QQC.ScrollBar {}
anchors.fill: parent

1
src/GUI/qml/FlightPlan.qml
View file

@ -2,7 +2,6 @@ import QtQuick 2.4
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/GettingStartedTipDisplay.qml
View file

@ -1,8 +1,6 @@
import QtQuick 2.4
import QtQml 2.4
import FlightGear 1.0
import "."
Item {
id: root

1
src/GUI/qml/GettingStartedTipLayer.qml
View file

@ -2,7 +2,6 @@ import QtQuick 2.4
import QtQml 2.4
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/GridToggleButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0
import "."
import FlightGear 1.0
Rectangle {
id: root

4
src/GUI/qml/HeaderBox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Rectangle {
id: headerRect
@ -13,7 +13,7 @@ Rectangle {
Text {
id: headerTitle
color: "white"
color: Style.themeContrastTextColor
anchors.verticalCenter: parent.verticalCenter
font.bold: true
font.pixelSize: Style.subHeadingFontPixelSize

1
src/GUI/qml/HelpSupport.qml
View file

@ -3,7 +3,6 @@ import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/HistoryPopup.qml
View file

@ -2,8 +2,6 @@ import QtQuick 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/IconButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0
import "."
import FlightGear 1.0
Rectangle {
id: root

2
src/GUI/qml/IntegerSpinbox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

1
src/GUI/qml/Launcher.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import QtQml 2.4
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/LineEdit.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

4
src/GUI/qml/ListHeaderBox.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.2
import FlightGear.Launcher 1.0 as FG
import "."
import FlightGear 1.0
Item {
id: root
@ -16,7 +16,7 @@ Item {
x: Style.strutSize
height: Style.strutSize
y: Style.margin
color: "white"
color: Style.backgroundColor
border.width: 1
border.color: Style.minorFrameColor

1
src/GUI/qml/LocationAltitudeRow.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.4
import "."
import FlightGear.Launcher 1.0
import FlightGear 1.0

2
src/GUI/qml/Menu.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/MenuDivider.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
BaseMenuItem {
height: 3

2
src/GUI/qml/MenuItem.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.6 // so we can use Shortcut
import "."
import FlightGear 1.0
BaseMenuItem {
id: root

2
src/GUI/qml/NewVersionNotification.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
ClickableText {
signal dismiss();

2
src/GUI/qml/NotificationArea.qml
View file

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQml 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: root

1
src/GUI/qml/NumericalEdit.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
FocusScope {
id: root

2
src/GUI/qml/PathListDelegate.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: delegateRoot

2
src/GUI/qml/PlainTextEditBox.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Rectangle {
id: editFrame

1
src/GUI/qml/PlanAirportView.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
Item {
id: root

1
src/GUI/qml/PlanRouteDetails.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
Item {
id: root

2
src/GUI/qml/PopupChoiceItem.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
id: choiceText

2
src/GUI/qml/RadioButton.qml
View file

@ -1,7 +1,5 @@
import QtQuick 2.4
import FlightGear 1.0
import "."
Item {
id: root

2
src/GUI/qml/RatingSlider.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Slider {
property var ratings: []

1
src/GUI/qml/RouteLegsView.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Rectangle
{

2
src/GUI/qml/SearchButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.2
import "."
import FlightGear 1.0
FocusScope
{

2
src/GUI/qml/Section.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear.Launcher 1.0
import FlightGear 1.0

2
src/GUI/qml/SettingCheckbox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
SettingControl {
id: root

2
src/GUI/qml/SettingControl.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/SettingDescription.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
property bool enabled: true

2
src/GUI/qml/SettingExtraArguments.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.4
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
SettingControl {
id: root

2
src/GUI/qml/SettingLineEdit.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
SettingControl {
id: root

3
src/GUI/qml/SettingPathChooser.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.4
import FlightGear 1.0 as FG
import "."
import FlightGear 1.0
SettingControl {
id: root

2
src/GUI/qml/SettingsComboBox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
SettingControl {
id: root

2
src/GUI/qml/SettingsDateTimePicker.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
SettingControl {
id: root

1
src/GUI/qml/Sidebar.qml
View file

@ -2,7 +2,6 @@ import QtQuick 2.4
import QtQml 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Rectangle {
id: root

2
src/GUI/qml/Slider.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

3
src/GUI/qml/StyledText.qml
View file

@ -1,6 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Text {
id: root

2
src/GUI/qml/Summary.qml
View file

@ -3,8 +3,6 @@ import QtQml 2.4
import FlightGear.Launcher 1.0
import FlightGear 1.0
import "."
Item {
id: root

1
src/GUI/qml/TabButton.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.4
import FlightGear 1.0
Rectangle {
id: root

2
src/GUI/qml/TimeEdit.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
FocusScope {
id: root

2
src/GUI/qml/ToggleBox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
property bool enabled: true

2
src/GUI/qml/ToggleSwitch.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Item {
id: root

2
src/GUI/qml/UpdateAllPanel.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.2
import FlightGear.Launcher 1.0 as FG
import "."
import FlightGear 1.0
ListHeaderBox {
id: root

2
src/GUI/qml/VariantMenu.qml
View file

@ -2,8 +2,6 @@ import QtQuick 2.4
import FlightGear 1.0
import FlightGear.Launcher 1.0
import "."
Rectangle {
id: root

3
src/GUI/qml/ViewCommandLine.qml
View file

@ -2,8 +2,7 @@ import QtQuick 2.4
import QtQuick.Controls 2.2
import FlightGear.Launcher 1.0
import "."
import FlightGear 1.0
Item {

4
src/GUI/qml/Weblink.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.4
import "."
import FlightGear 1.0
Rectangle {
id: root
@ -16,7 +16,7 @@ Rectangle {
id: label
x: Style.margin
anchors.verticalCenter: parent.verticalCenter
color: "white"
color: Style.themeContrastTextColor
font.underline: mouse.containsMouse
}

2
src/GUI/qml/YesNoPanel.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0
import "."
import FlightGear 1.0
Item {
property alias promptText:prompt.text