From: Camila Ayres Date: Wed, 7 Aug 2024 20:02:39 +0000 (+0200) Subject: Remove qml component version from import. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~34^2~35 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=de5adadd3f350e5d357a4771d7577ecda843258b;p=nextcloud-desktop.git Remove qml component version from import. Signed-off-by: Camila Ayres --- diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml index 851e7ceef..a890adeaf 100644 --- a/src/gui/BasicComboBox.qml +++ b/src/gui/BasicComboBox.qml @@ -12,12 +12,12 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style import "./tray" ComboBox { diff --git a/src/gui/ConflictDelegate.qml b/src/gui/ConflictDelegate.qml index 915173507..07ebea178 100644 --- a/src/gui/ConflictDelegate.qml +++ b/src/gui/ConflictDelegate.qml @@ -12,12 +12,12 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import Style +import com.nextcloud.desktopclient import "./tray" Item { diff --git a/src/gui/ConflictItemFileInfo.qml b/src/gui/ConflictItemFileInfo.qml index be345f7e8..ba1f87510 100644 --- a/src/gui/ConflictItemFileInfo.qml +++ b/src/gui/ConflictItemFileInfo.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import Style import "./tray" Item { diff --git a/src/gui/EmojiPicker.qml b/src/gui/EmojiPicker.qml index 9c1882ed4..bf3a0dfd0 100644 --- a/src/gui/EmojiPicker.qml +++ b/src/gui/EmojiPicker.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import Style 1.0 +import Style import com.nextcloud.desktopclient 1.0 as NC import "./tray" diff --git a/src/gui/ErrorBox.qml b/src/gui/ErrorBox.qml index 1ac6c5e2a..f51fd417d 100644 --- a/src/gui/ErrorBox.qml +++ b/src/gui/ErrorBox.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import Style 1.0 +import Style import "./tray" Item { diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml index f51716a72..b44147103 100644 --- a/src/gui/PredefinedStatusButton.qml +++ b/src/gui/PredefinedStatusButton.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import Style 1.0 +import Style import "./tray" AbstractButton { diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index 485d874eb..af404fba4 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -12,14 +12,14 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Window 2.15 as QtWindow -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQml.Models 2.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Window as QtWindow +import QtQuick.Layouts +import QtQuick.Controls +import QtQml.Models +import Style +import com.nextcloud.desktopclient import "./tray" ApplicationWindow { diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml index 91ef770f6..3d2452c6c 100644 --- a/src/gui/UserStatusSelector.qml +++ b/src/gui/UserStatusSelector.qml @@ -12,14 +12,14 @@ * for more details. */ -import QtQuick 2.6 +import QtQuick import QtQuick.Dialogs -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window -import com.nextcloud.desktopclient 1.0 as NC -import Style 1.0 +import com.nextcloud.desktopclient as NC +import Style import "./tray" ColumnLayout { diff --git a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml index c549d2526..01b499daf 100644 --- a/src/gui/UserStatusSelectorButton.qml +++ b/src/gui/UserStatusSelectorButton.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.6 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import Style 1.0 +import Style import "./tray" diff --git a/src/gui/UserStatusSelectorPage.qml b/src/gui/UserStatusSelectorPage.qml index 42b92249f..c40654b6f 100644 --- a/src/gui/UserStatusSelectorPage.qml +++ b/src/gui/UserStatusSelectorPage.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 +import QtQuick +import QtQuick.Controls +import Style -import com.nextcloud.desktopclient 1.0 as NC +import com.nextcloud.desktopclient as NC Page { id: page