From 37ff0b5318c75bccb699c5c41188b6588da1bef2 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sat, 23 Dec 2023 17:48:04 +0100 Subject: [PATCH] [app] Remove QML import versions Those are not needed in Qt6 and only get in the way --- app/qml/DevicePage.qml | 12 ++++++------ app/qml/FindDevicesPage.qml | 10 +++++----- app/qml/MprisSlider.qml | 4 ++-- app/qml/PluginInfoPage.qml | 4 ++-- app/qml/PluginItem.qml | 10 +++++----- app/qml/PluginSettings.qml | 10 +++++----- app/qml/Settings.qml | 14 +++++++------- app/qml/main.qml | 10 +++++----- app/qml/mousepad.qml | 10 +++++----- app/qml/mpris.qml | 8 ++++---- app/qml/presentationRemote.qml | 8 ++++---- app/qml/runcommand.qml | 10 +++++----- app/qml/volume.qml | 10 +++++----- smsapp/qml/AttachmentViewer.qml | 8 ++++---- smsapp/qml/ChatMessage.qml | 8 ++++---- smsapp/qml/ConversationDisplay.qml | 12 ++++++------ smsapp/qml/ConversationList.qml | 12 ++++++------ smsapp/qml/MessageAttachments.qml | 8 ++++---- smsapp/qml/SendingArea.qml | 10 +++++----- smsapp/qml/main.qml | 10 +++++----- 20 files changed, 94 insertions(+), 94 deletions(-) diff --git a/app/qml/DevicePage.qml b/app/qml/DevicePage.qml index e5aa08f71..2293f51df 100644 --- a/app/qml/DevicePage.qml +++ b/app/qml/DevicePage.qml @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQuick.Dialogs @QTQUICK_DIALOGS_IMPORT_VERSION@ -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQuick.Dialogs +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.ScrollablePage { id: root diff --git a/app/qml/FindDevicesPage.qml b/app/qml/FindDevicesPage.qml index 10e75bc02..600c6731b 100644 --- a/app/qml/FindDevicesPage.qml +++ b/app/qml/FindDevicesPage.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.ScrollablePage { diff --git a/app/qml/MprisSlider.qml b/app/qml/MprisSlider.qml index 07785d2bd..8803c49fb 100644 --- a/app/qml/MprisSlider.qml +++ b/app/qml/MprisSlider.qml @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls Loader { diff --git a/app/qml/PluginInfoPage.qml b/app/qml/PluginInfoPage.qml index 6ea534f4d..ab06bf0c1 100644 --- a/app/qml/PluginInfoPage.qml +++ b/app/qml/PluginInfoPage.qml @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import org.kde.kirigami 2.20 as Kirigami +import QtQuick +import org.kde.kirigami as Kirigami Kirigami.Page { id: root diff --git a/app/qml/PluginItem.qml b/app/qml/PluginItem.qml index c49227191..127a8656b 100644 --- a/app/qml/PluginItem.qml +++ b/app/qml/PluginItem.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect QtObject { diff --git a/app/qml/PluginSettings.qml b/app/qml/PluginSettings.qml index f93bd319e..137a3d57c 100644 --- a/app/qml/PluginSettings.qml +++ b/app/qml/PluginSettings.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.ScrollablePage { id: root diff --git a/app/qml/Settings.qml b/app/qml/Settings.qml index 3f9bd3c70..9012b925b 100644 --- a/app/qml/Settings.qml +++ b/app/qml/Settings.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Carl Schwan // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kdeconnect 1.0 -import org.kde.kdeconnect.app 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kdeconnect +import org.kde.kdeconnect.app FormCard.FormCardPage { title: i18nc("@title:window", "Settings") diff --git a/app/qml/main.qml b/app/qml/main.qml index 54fcf6e6a..8a28438b7 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.ApplicationWindow { id: root diff --git a/app/qml/mousepad.qml b/app/qml/mousepad.qml index bf867555e..15e68b601 100644 --- a/app/qml/mousepad.qml +++ b/app/qml/mousepad.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.7 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.Page { diff --git a/app/qml/mpris.qml b/app/qml/mpris.qml index 18ca5c42a..d2aa2c4e2 100644 --- a/app/qml/mpris.qml +++ b/app/qml/mpris.qml @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami Kirigami.Page { diff --git a/app/qml/presentationRemote.qml b/app/qml/presentationRemote.qml index 8f99ab5ba..e7b30b8d5 100644 --- a/app/qml/presentationRemote.qml +++ b/app/qml/presentationRemote.qml @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami Kirigami.Page { diff --git a/app/qml/runcommand.qml b/app/qml/runcommand.qml index abf7b2a65..6d5744095 100644 --- a/app/qml/runcommand.qml +++ b/app/qml/runcommand.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.ScrollablePage { diff --git a/app/qml/volume.qml b/app/qml/volume.qml index 5497c4f10..a35c28b66 100644 --- a/app/qml/volume.qml +++ b/app/qml/volume.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.2 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami -import org.kde.kdeconnect 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect Kirigami.Page { diff --git a/smsapp/qml/AttachmentViewer.qml b/smsapp/qml/AttachmentViewer.qml index 8c43f997a..7885dfa81 100644 --- a/smsapp/qml/AttachmentViewer.qml +++ b/smsapp/qml/AttachmentViewer.qml @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import org.kde.kirigami 2.13 as Kirigami +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import org.kde.kirigami as Kirigami import QtMultimedia Kirigami.Page { diff --git a/smsapp/qml/ChatMessage.qml b/smsapp/qml/ChatMessage.qml index b94fd449b..714a59ba4 100644 --- a/smsapp/qml/ChatMessage.qml +++ b/smsapp/qml/ChatMessage.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.components as KirigamiComponents Item { diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml index b7b717399..99a0fc605 100644 --- a/smsapp/qml/ConversationDisplay.qml +++ b/smsapp/qml/ConversationDisplay.qml @@ -6,12 +6,12 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Controls 2.2 as Controls -import QtQuick.Layouts 1.1 -import org.kde.people 1.0 -import org.kde.kirigami 2.4 as Kirigami -import org.kde.kdeconnect.sms 1.0 +import QtQuick +import QtQuick.Controls as Controls +import QtQuick.Layouts +import org.kde.people +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect.sms import Qt5Compat.GraphicalEffects Kirigami.ScrollablePage diff --git a/smsapp/qml/ConversationList.qml b/smsapp/qml/ConversationList.qml index 1100f6ab0..4cbb95e7c 100644 --- a/smsapp/qml/ConversationList.qml +++ b/smsapp/qml/ConversationList.qml @@ -6,14 +6,14 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.5 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 -import org.kde.people 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.people import org.kde.kirigami as Kirigami import org.kde.kirigami.delegates as KirigamiDelegates -import org.kde.kdeconnect 1.0 -import org.kde.kdeconnect.sms 1.0 +import org.kde.kdeconnect +import org.kde.kdeconnect.sms Kirigami.ScrollablePage { diff --git a/smsapp/qml/MessageAttachments.qml b/smsapp/qml/MessageAttachments.qml index f0e59a074..ce985d447 100644 --- a/smsapp/qml/MessageAttachments.qml +++ b/smsapp/qml/MessageAttachments.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami as Kirigami import QtMultimedia Item { diff --git a/smsapp/qml/SendingArea.qml b/smsapp/qml/SendingArea.qml index 2a861c456..ccee19798 100644 --- a/smsapp/qml/SendingArea.qml +++ b/smsapp/qml/SendingArea.qml @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.1 -import QtQuick.Controls 2.2 as Controls -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.4 as Kirigami +import QtQuick +import QtQuick.Controls as Controls +import QtQuick.Layouts +import org.kde.kirigami as Kirigami import Qt5Compat.GraphicalEffects import QtQuick.Dialogs -import org.kde.kdeconnect.sms 1.0 +import org.kde.kdeconnect.sms ColumnLayout { id: root diff --git a/smsapp/qml/main.qml b/smsapp/qml/main.qml index 3fea71b2a..90923b0a0 100644 --- a/smsapp/qml/main.qml +++ b/smsapp/qml/main.qml @@ -6,11 +6,11 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.1 -import org.kde.kirigami 2.6 as Kirigami -import org.kde.kdeconnect 1.0 -import org.kde.kdeconnect.sms 1.0 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import QtQuick +import org.kde.kirigami as Kirigami +import org.kde.kdeconnect +import org.kde.kdeconnect.sms +import org.kde.kirigamiaddons.formcard as FormCard Kirigami.ApplicationWindow {