From 4c2e52c2dce59f20410c9ff8607119394fb2cba1 Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 19 Mar 2018 08:22:11 +0000 Subject: [PATCH] Standardise QtQuick version to 2.4 Will fix an issue reported on the forum where a 2.7 dep crept it. --- src/GUI/qml/AdvancedSettingsToggle.qml | 2 +- src/GUI/qml/AircraftDetailsView.qml | 2 +- src/GUI/qml/AircraftDownloadPanel.qml | 2 +- src/GUI/qml/AircraftFullDelegate.qml | 2 +- src/GUI/qml/AircraftPreviewPanel.qml | 2 +- src/GUI/qml/AircraftRating.qml | 2 +- src/GUI/qml/AircraftVariantChoice.qml | 2 +- src/GUI/qml/AircraftWarningPanel.qml | 2 +- src/GUI/qml/ArrowButton.qml | 2 +- src/GUI/qml/Checkbox.qml | 2 +- src/GUI/qml/ClickableText.qml | 2 +- src/GUI/qml/DateTimeEdit.qml | 2 +- src/GUI/qml/Environment.qml | 2 +- src/GUI/qml/HistoryPopup.qml | 2 +- src/GUI/qml/LauncherSettings.qml | 2 +- src/GUI/qml/RatingSlider.qml | 2 +- src/GUI/qml/Scrollbar.qml | 2 +- src/GUI/qml/SettingCheckbox.qml | 2 +- src/GUI/qml/SettingDescription.qml | 2 +- src/GUI/qml/SettingExtraArguments.qml | 2 +- src/GUI/qml/SettingLineEdit.qml | 2 +- src/GUI/qml/SettingsDateTimePicker.qml | 2 +- src/GUI/qml/Slider.qml | 2 +- src/GUI/qml/Summary.qml | 2 +- src/GUI/qml/TabButton.qml | 2 +- src/GUI/qml/ToggleSwitch.qml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/GUI/qml/AdvancedSettingsToggle.qml b/src/GUI/qml/AdvancedSettingsToggle.qml index 553cf1a9b..e0fb17399 100644 --- a/src/GUI/qml/AdvancedSettingsToggle.qml +++ b/src/GUI/qml/AdvancedSettingsToggle.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Item { diff --git a/src/GUI/qml/AircraftDetailsView.qml b/src/GUI/qml/AircraftDetailsView.qml index 3f85a1a24..3ce106048 100644 --- a/src/GUI/qml/AircraftDetailsView.qml +++ b/src/GUI/qml/AircraftDetailsView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 import "." diff --git a/src/GUI/qml/AircraftDownloadPanel.qml b/src/GUI/qml/AircraftDownloadPanel.qml index e488b9c5a..6aeffb0e7 100644 --- a/src/GUI/qml/AircraftDownloadPanel.qml +++ b/src/GUI/qml/AircraftDownloadPanel.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 import "." // -> forces the qmldir to be loaded diff --git a/src/GUI/qml/AircraftFullDelegate.qml b/src/GUI/qml/AircraftFullDelegate.qml index c88cde72b..218b37f94 100644 --- a/src/GUI/qml/AircraftFullDelegate.qml +++ b/src/GUI/qml/AircraftFullDelegate.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 Item { diff --git a/src/GUI/qml/AircraftPreviewPanel.qml b/src/GUI/qml/AircraftPreviewPanel.qml index 445b2d757..969e66185 100644 --- a/src/GUI/qml/AircraftPreviewPanel.qml +++ b/src/GUI/qml/AircraftPreviewPanel.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 Rectangle { diff --git a/src/GUI/qml/AircraftRating.qml b/src/GUI/qml/AircraftRating.qml index 08ec59d68..02fbde183 100644 --- a/src/GUI/qml/AircraftRating.qml +++ b/src/GUI/qml/AircraftRating.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Item { diff --git a/src/GUI/qml/AircraftVariantChoice.qml b/src/GUI/qml/AircraftVariantChoice.qml index 96bd433aa..5ec401a11 100644 --- a/src/GUI/qml/AircraftVariantChoice.qml +++ b/src/GUI/qml/AircraftVariantChoice.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import QtQuick.Window 2.0 import "." // -> forces the qmldir to be loaded diff --git a/src/GUI/qml/AircraftWarningPanel.qml b/src/GUI/qml/AircraftWarningPanel.qml index fc88e2e10..1cfc9d41d 100644 --- a/src/GUI/qml/AircraftWarningPanel.qml +++ b/src/GUI/qml/AircraftWarningPanel.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 Rectangle { diff --git a/src/GUI/qml/ArrowButton.qml b/src/GUI/qml/ArrowButton.qml index 3f6b7b914..c7260f86e 100644 --- a/src/GUI/qml/ArrowButton.qml +++ b/src/GUI/qml/ArrowButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 Item { id: root diff --git a/src/GUI/qml/Checkbox.qml b/src/GUI/qml/Checkbox.qml index 30a8bb270..fb17da7ee 100644 --- a/src/GUI/qml/Checkbox.qml +++ b/src/GUI/qml/Checkbox.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 Item { property bool checked: false diff --git a/src/GUI/qml/ClickableText.qml b/src/GUI/qml/ClickableText.qml index c817c3f54..dff111dfa 100644 --- a/src/GUI/qml/ClickableText.qml +++ b/src/GUI/qml/ClickableText.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Text { diff --git a/src/GUI/qml/DateTimeEdit.qml b/src/GUI/qml/DateTimeEdit.qml index 8df687980..2005d2fc6 100644 --- a/src/GUI/qml/DateTimeEdit.qml +++ b/src/GUI/qml/DateTimeEdit.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." FocusScope { diff --git a/src/GUI/qml/Environment.qml b/src/GUI/qml/Environment.qml index 919224c6b..d5e4f0e71 100644 --- a/src/GUI/qml/Environment.qml +++ b/src/GUI/qml/Environment.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 import "." diff --git a/src/GUI/qml/HistoryPopup.qml b/src/GUI/qml/HistoryPopup.qml index 97e62b247..5530f5245 100644 --- a/src/GUI/qml/HistoryPopup.qml +++ b/src/GUI/qml/HistoryPopup.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import QtQuick.Window 2.0 import FlightGear.Launcher 1.0 diff --git a/src/GUI/qml/LauncherSettings.qml b/src/GUI/qml/LauncherSettings.qml index feeac05d3..cd72ee3aa 100644 --- a/src/GUI/qml/LauncherSettings.qml +++ b/src/GUI/qml/LauncherSettings.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 diff --git a/src/GUI/qml/RatingSlider.qml b/src/GUI/qml/RatingSlider.qml index deadcd0e5..2a2d3c90d 100644 --- a/src/GUI/qml/RatingSlider.qml +++ b/src/GUI/qml/RatingSlider.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Slider { diff --git a/src/GUI/qml/Scrollbar.qml b/src/GUI/qml/Scrollbar.qml index 2956fa9eb..b63e86620 100644 --- a/src/GUI/qml/Scrollbar.qml +++ b/src/GUI/qml/Scrollbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 Item diff --git a/src/GUI/qml/SettingCheckbox.qml b/src/GUI/qml/SettingCheckbox.qml index 3aa24bb69..0814f47a1 100644 --- a/src/GUI/qml/SettingCheckbox.qml +++ b/src/GUI/qml/SettingCheckbox.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." SettingControl { diff --git a/src/GUI/qml/SettingDescription.qml b/src/GUI/qml/SettingDescription.qml index bee48db9e..57dec2515 100644 --- a/src/GUI/qml/SettingDescription.qml +++ b/src/GUI/qml/SettingDescription.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Text { diff --git a/src/GUI/qml/SettingExtraArguments.qml b/src/GUI/qml/SettingExtraArguments.qml index 738b77920..77714efce 100644 --- a/src/GUI/qml/SettingExtraArguments.qml +++ b/src/GUI/qml/SettingExtraArguments.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 import "." diff --git a/src/GUI/qml/SettingLineEdit.qml b/src/GUI/qml/SettingLineEdit.qml index e70601dcf..bcea7b5dd 100644 --- a/src/GUI/qml/SettingLineEdit.qml +++ b/src/GUI/qml/SettingLineEdit.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.4 import "." SettingControl { diff --git a/src/GUI/qml/SettingsDateTimePicker.qml b/src/GUI/qml/SettingsDateTimePicker.qml index 082594c3a..ae1235f68 100644 --- a/src/GUI/qml/SettingsDateTimePicker.qml +++ b/src/GUI/qml/SettingsDateTimePicker.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." SettingControl { diff --git a/src/GUI/qml/Slider.qml b/src/GUI/qml/Slider.qml index 901f37f74..3dcfb1353 100644 --- a/src/GUI/qml/Slider.qml +++ b/src/GUI/qml/Slider.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Item { diff --git a/src/GUI/qml/Summary.qml b/src/GUI/qml/Summary.qml index e22d00072..abeb0a1a8 100644 --- a/src/GUI/qml/Summary.qml +++ b/src/GUI/qml/Summary.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import FlightGear.Launcher 1.0 import "." diff --git a/src/GUI/qml/TabButton.qml b/src/GUI/qml/TabButton.qml index be5241d16..f09ecb644 100644 --- a/src/GUI/qml/TabButton.qml +++ b/src/GUI/qml/TabButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 Rectangle { id: root diff --git a/src/GUI/qml/ToggleSwitch.qml b/src/GUI/qml/ToggleSwitch.qml index 5924037af..900309472 100644 --- a/src/GUI/qml/ToggleSwitch.qml +++ b/src/GUI/qml/ToggleSwitch.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import "." Item {