Merge pull request #1278 from paulober/burn-qml-import-version-numbers

tdewey-rpi · web-flow · commit 82f5d437aea5 · 2025-10-23T16:50:14.000+01:00
fix(QML): Remove versions from QML imports
diff --git a/src/CommonStrings.qml b/src/CommonStrings.qml
@@ -5,7 +5,7 @@
 
 pragma Singleton
 
-import QtQuick 2.15
+import QtQuick
 
 Item {
     // Commonly reused translatable strings
diff --git a/src/Style.qml b/src/Style.qml
@@ -5,7 +5,7 @@
 
 pragma Singleton
 
-import QtQuick 2.15
+import QtQuick
 
 Item {
     id: root
diff --git a/src/main.qml b/src/main.qml
@@ -3,11 +3,11 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.9
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.0
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import "qmlcomponents"
 import "wizard"
 
diff --git a/src/qmlcomponents/BaseDialog.qml b/src/qmlcomponents/BaseDialog.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import RpiImager
 
 /**
diff --git a/src/qmlcomponents/ImButton.qml b/src/qmlcomponents/ImButton.qml
@@ -3,8 +3,8 @@
  * Copyright (C) 2022 Raspberry Pi Ltd
  */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
 import RpiImager
 
diff --git a/src/qmlcomponents/ImButtonRed.qml b/src/qmlcomponents/ImButtonRed.qml
@@ -2,8 +2,9 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright (C) 2022 Raspberry Pi Ltd
  */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+
+import QtQuick
+import QtQuick.Controls
 
 import RpiImager
 
diff --git a/src/qmlcomponents/ImCheckBox.qml b/src/qmlcomponents/ImCheckBox.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2022 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import RpiImager
 
 CheckBox {
diff --git a/src/qmlcomponents/ImCloseButton.qml b/src/qmlcomponents/ImCloseButton.qml
@@ -4,8 +4,8 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQuick.Layouts
 
 import RpiImager
 
diff --git a/src/qmlcomponents/ImComboBox.qml b/src/qmlcomponents/ImComboBox.qml
@@ -5,9 +5,9 @@
 
 pragma ComponentBehavior: Bound
 
-import QtQuick 2.15
-import QtQuick.Controls 2.2
-import QtQuick.Window 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
 
 import RpiImager
 
@@ -258,4 +258,4 @@ ComboBox {
             }
         }
     }
-}
+}
diff --git a/src/qmlcomponents/ImFileDialog.qml b/src/qmlcomponents/ImFileDialog.qml
@@ -4,10 +4,10 @@
  */
 
 import QtCore
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import Qt.labs.folderlistmodel 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt.labs.folderlistmodel
 import RpiImager
 
 BaseDialog {
diff --git a/src/qmlcomponents/ImOptionButton.qml b/src/qmlcomponents/ImOptionButton.qml
@@ -3,8 +3,8 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 import RpiImager
 
 // A labeled button styled for Imager; only the button clicks, not the whole row
diff --git a/src/qmlcomponents/ImOptionPill.qml b/src/qmlcomponents/ImOptionPill.qml
@@ -3,11 +3,11 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import RpiImager
-import QtQuick.Controls.Material 2.15
+import QtQuick.Controls.Material
 
 // A labeled switch styled for Imager; only the switch toggles, not the whole row
 Item {
diff --git a/src/qmlcomponents/ImPopup.qml b/src/qmlcomponents/ImPopup.qml
@@ -3,10 +3,10 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.0
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 
 import RpiImager
 
diff --git a/src/qmlcomponents/ImToggleTab.qml b/src/qmlcomponents/ImToggleTab.qml
@@ -2,8 +2,8 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 
 import RpiImager
 
diff --git a/src/qmlcomponents/OSSelectionListView.qml b/src/qmlcomponents/OSSelectionListView.qml
@@ -3,8 +3,8 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 
 import RpiImager
 
diff --git a/src/qmlcomponents/SelectionListView.qml b/src/qmlcomponents/SelectionListView.qml
@@ -5,8 +5,8 @@
 
 pragma ComponentBehavior: Bound
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 
 import RpiImager
 
diff --git a/src/wizard/DeviceSelectionStep.qml b/src/wizard/DeviceSelectionStep.qml
@@ -3,10 +3,10 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
 import "../qmlcomponents"
 
 import RpiImager
diff --git a/src/wizard/DoneStep.qml b/src/wizard/DoneStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 
 import RpiImager
diff --git a/src/wizard/HostnameCustomizationStep.qml b/src/wizard/HostnameCustomizationStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 import "components"
 
@@ -96,4 +96,4 @@ WizardStepBase {
         // Jump to writing step
         wizardContainer.jumpToStep(wizardContainer.stepWriting)
     }
-} 
+} 
diff --git a/src/wizard/IfAndFeaturesCustomizationStep.qml b/src/wizard/IfAndFeaturesCustomizationStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 import QtQuick.Dialogs
 import QtCore
 import "../qmlcomponents"
diff --git a/src/wizard/LanguageSelectionStep.qml b/src/wizard/LanguageSelectionStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 import "components"
 
diff --git a/src/wizard/LocaleCustomizationStep.qml b/src/wizard/LocaleCustomizationStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 import "components"
 
diff --git a/src/wizard/OSSelectionStep.qml b/src/wizard/OSSelectionStep.qml
@@ -3,9 +3,9 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import QtQuick.Dialogs
 import QtCore
 import "../qmlcomponents"
diff --git a/src/wizard/StorageSelectionStep.qml b/src/wizard/StorageSelectionStep.qml
@@ -5,9 +5,9 @@
 
 pragma ComponentBehavior: Bound
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 
 import RpiImager
@@ -416,4 +416,4 @@ WizardStepBase {
             // no-op
         }
     }
-} 
+} 
diff --git a/src/wizard/UserCustomizationStep.qml b/src/wizard/UserCustomizationStep.qml
@@ -3,8 +3,8 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 import "../qmlcomponents"
 import "components"
 
@@ -158,4 +158,4 @@ WizardStepBase {
         // Jump to writing step
         wizardContainer.jumpToStep(wizardContainer.stepWriting)
     }
-} 
+} 
diff --git a/src/wizard/WifiCustomizationStep.qml b/src/wizard/WifiCustomizationStep.qml
@@ -3,8 +3,8 @@
  * Copyright (C) 2020 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 import QtQuick.Controls
 import "../qmlcomponents"
 import "components"
diff --git a/src/wizard/WizardContainer.qml b/src/wizard/WizardContainer.qml
@@ -4,9 +4,9 @@
  */
 pragma ComponentBehavior: Bound
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 
 import RpiImager
diff --git a/src/wizard/WizardStepBase.qml b/src/wizard/WizardStepBase.qml
@@ -3,10 +3,10 @@
  * Copyright (C) 2025 Raspberry Pi Ltd
  */
 
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
 import "../qmlcomponents"
 
 import RpiImager
@@ -289,4 +289,4 @@ FocusScope {
         var prevIndex = (currentIndex - 1 + allFocusable.length) % allFocusable.length
         return allFocusable[prevIndex]
     }
-} 
+} 
diff --git a/src/wizard/WritingStep.qml b/src/wizard/WritingStep.qml
diff --git a/src/wizard/components/WizardDescriptionText.qml b/src/wizard/components/WizardDescriptionText.qml
diff --git a/src/wizard/components/WizardFormLabel.qml b/src/wizard/components/WizardFormLabel.qml
diff --git a/src/wizard/components/WizardSectionContainer.qml b/src/wizard/components/WizardSectionContainer.qml
diff --git a/src/wizard/dialogs/AppOptionsDialog.qml b/src/wizard/dialogs/AppOptionsDialog.qml
diff --git a/src/wizard/dialogs/ConfirmSystemDriveDialog.qml b/src/wizard/dialogs/ConfirmSystemDriveDialog.qml
diff --git a/src/wizard/dialogs/ConfirmUnfilterDialog.qml b/src/wizard/dialogs/ConfirmUnfilterDialog.qml
diff --git a/src/wizard/dialogs/KeychainPermissionDialog.qml b/src/wizard/dialogs/KeychainPermissionDialog.qml
diff --git a/src/wizard/dialogs/UpdateAvailableDialog.qml b/src/wizard/dialogs/UpdateAvailableDialog.qml

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`pragma ComponentBehavior: Bound`
`7`	`7`
`8`		`-import QtQuick 2.15`
`9`		`-import QtQuick.Controls 2.2`
`10`		`-import QtQuick.Window 2.15`
	`8`	`+import QtQuick`
	`9`	`+import QtQuick.Controls`
	`10`	`+import QtQuick.Window`
`11`	`11`
`12`	`12`	`import RpiImager`
`13`	`13`
`@@ -258,4 +258,4 @@ ComboBox {`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`}`
`261`		`-}`
	`261`	`+}`