Skip to content

Commit 3f7303a

Browse files
committed
QML: remove version numbers from Qt imports
Remove version numbers from QML import statements which import modules from the Qt standard libraries. The Qt 6 documentation doesn't show these version numbers, so I guess they are discouraged now. Also I got an error from `import QtQuick 1.2` - the version is apparently too old. In any case the version imports can't be a reliable way of controlling behavior since if multiple documents import different version numbers of the same module, the highest one will win. Also remove version numbers from the imports of QmlDownloader from our own program since that's clearly pointless.
1 parent 1f5af1e commit 3f7303a

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

DownloadInfo.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.0
19-
import QtQuick.Controls 2.1
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
2219
import Fluid.Material 1.0 as FluidMaterial
2320
import QmlDownloader 1.0
21+
import QtQuick
22+
import QtQuick.Controls
23+
import QtQuick.Controls.Material
2424
import "utils.js" as Utils
2525

2626
Item {

News.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.0
19-
import QtQuick.Controls 2.1
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
2219
import Fluid.Material 1.0 as FluidMaterial
20+
import QtQuick
21+
import QtQuick.Controls
22+
import QtQuick.Controls.Material
2323

2424
Item {
2525
width: parent.width

NewsCard.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.0
19-
import QtQuick.Controls 2.0
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
22-
import QtQuick.Layouts 1.3
19+
import QtQuick.Layouts
20+
import QtQuick
21+
import QtQuick.Controls
22+
import QtQuick.Controls.Material
2323

2424
Flickable {
2525
id: item

Settings.qml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.0
19-
import QtQuick.Controls 2.1
20-
import QtQuick.Controls.Material 2.0
21-
import QtQuick.Dialogs 1.2
22-
import QtQuick.Layouts 1.3
2318
import Fluid.Controls 1.0 as FluidControls
2419
import Fluid.Material 1.0 as FluidMaterial
25-
import QmlDownloader 1.0
20+
import QtQuick
21+
import QtQuick.Controls
22+
import QtQuick.Controls.Material
23+
import QtQuick.Dialogs
24+
import QtQuick.Layouts
25+
import QmlDownloader
2626

2727
Item {
2828
id: settingsItem

UpdateFailed.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.7
19-
import QtQuick.Controls 2.0
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
19+
import QtQuick
20+
import QtQuick.Controls
21+
import QtQuick.Controls.Material
2222
import "utils.js" as Utils
2323

2424
Popup {

main.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.7
19-
import QtQuick.Controls 2.0
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
2219
import Fluid.Material 1.0 as FluidMaterial
20+
import QtQuick
21+
import QtQuick.Controls
22+
import QtQuick.Controls.Material
2323
import "utils.js" as Utils
2424

2525
ApplicationWindow {

splash.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
import QtQuick 2.0
19-
import QtQuick.Controls 2.0
20-
import QtQuick.Controls.Material 2.0
2118
import Fluid.Controls 1.0 as FluidControls
2219
import Fluid.Material 1.0 as FluidMaterial
20+
import QtQuick
21+
import QtQuick.Controls
22+
import QtQuick.Controls.Material
2323

2424
ApplicationWindow {
2525
visible: true

0 commit comments

Comments
 (0)