From afeb39743e13eb74e422daf9fb550756d2cc24d8 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Fri, 20 Dec 2024 06:32:33 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/438 --- qt6/src/qml/AboutAction.qml | 2 +- qt6/src/qml/AboutDialog.qml | 6 +++--- qt6/src/qml/AbstractButton.qml | 2 +- qt6/src/qml/Action.qml | 2 +- qt6/src/qml/ActionButton.qml | 2 +- qt6/src/qml/ActionGroup.qml | 2 +- qt6/src/qml/AlertToolTip.qml | 2 +- qt6/src/qml/ApplicationWindow.qml | 2 +- qt6/src/qml/ArrowListView.qml | 6 +++--- qt6/src/qml/ArrowShapePopup.qml | 4 ++-- qt6/src/qml/ArrowShapePopupWindow.qml | 4 ++-- qt6/src/qml/BoxInsetShadow.qml | 2 +- qt6/src/qml/BoxPanel.qml | 2 +- qt6/src/qml/BoxShadow.qml | 2 +- qt6/src/qml/BusyIndicator.qml | 2 +- qt6/src/qml/Button.qml | 2 +- qt6/src/qml/ButtonBox.qml | 4 ++-- qt6/src/qml/ButtonGroup.qml | 2 +- qt6/src/qml/ButtonIndicator.qml | 2 +- qt6/src/qml/CheckBox.qml | 4 ++-- qt6/src/qml/CheckDelegate.qml | 4 ++-- qt6/src/qml/CicleSpreadAnimation.qml | 2 +- qt6/src/qml/ComboBox.qml | 4 ++-- qt6/src/qml/Container.qml | 2 +- qt6/src/qml/Control.qml | 2 +- qt6/src/qml/ControlBackground.qml | 2 +- qt6/src/qml/ControlGroup.qml | 4 ++-- qt6/src/qml/ControlGroupItem.qml | 4 ++-- qt6/src/qml/DelayButton.qml | 4 ++-- qt6/src/qml/Dial.qml | 2 +- qt6/src/qml/Dialog.qml | 2 +- qt6/src/qml/DialogButtonBox.qml | 2 +- qt6/src/qml/DragItemsImage.qml | 2 +- qt6/src/qml/Drawer.qml | 2 +- qt6/src/qml/EditPanel.qml | 2 +- qt6/src/qml/EmbeddedProgressBar.qml | 4 ++-- qt6/src/qml/FloatingButton.qml | 2 +- qt6/src/qml/FloatingMessage.qml | 4 ++-- qt6/src/qml/FloatingPanel.qml | 2 +- qt6/src/qml/FlowStyle.qml | 2 +- qt6/src/qml/FocusBoxBorder.qml | 2 +- qt6/src/qml/Frame.qml | 2 +- qt6/src/qml/GroupBox.qml | 2 +- qt6/src/qml/HelpAction.qml | 2 +- qt6/src/qml/HighlightPanel.qml | 2 +- qt6/src/qml/IconButton.qml | 2 +- qt6/src/qml/InsideBoxBorder.qml | 4 ++-- qt6/src/qml/IpV4LineEdit.qml | 2 +- qt6/src/qml/ItemDelegate.qml | 2 +- qt6/src/qml/KeySequenceEdit.qml | 4 ++-- qt6/src/qml/Label.qml | 2 +- qt6/src/qml/LineEdit.qml | 2 +- qt6/src/qml/ListView.qml | 2 +- qt6/src/qml/Menu.qml | 6 +++--- qt6/src/qml/MenuBar.qml | 2 +- qt6/src/qml/MenuItem.qml | 2 +- qt6/src/qml/MenuSeparator.qml | 2 +- qt6/src/qml/OutsideBoxBorder.qml | 2 +- qt6/src/qml/PageIndicator.qml | 2 +- qt6/src/qml/PasswordEdit.qml | 2 +- qt6/src/qml/PlaceholderText.qml | 4 ++-- qt6/src/qml/PlusMinusSpinBox.qml | 4 ++-- qt6/src/qml/Popup.qml | 4 ++-- qt6/src/qml/PopupWindow.qml | 4 ++-- qt6/src/qml/ProgressBar.qml | 2 +- qt6/src/qml/QuitAction.qml | 2 +- qt6/src/qml/RadioButton.qml | 2 +- qt6/src/qml/RectangularShadow.qml | 2 +- qt6/src/qml/ScrollBar.qml | 2 +- qt6/src/qml/ScrollIndicator.qml | 2 +- qt6/src/qml/ScrollView.qml | 2 +- qt6/src/qml/SearchEdit.qml | 4 ++-- qt6/src/qml/Slider.qml | 4 ++-- qt6/src/qml/SliderHandle.qml | 2 +- qt6/src/qml/SliderTipItem.qml | 2 +- qt6/src/qml/SortFilterModel.qml | 2 +- qt6/src/qml/SpinBox.qml | 2 +- qt6/src/qml/SpinBoxIndicator.qml | 2 +- qt6/src/qml/StackView.qml | 2 +- qt6/src/qml/SwipeDelegate.qml | 2 +- qt6/src/qml/SwipeView.qml | 2 +- qt6/src/qml/Switch.qml | 2 +- qt6/src/qml/TabBar.qml | 2 +- qt6/src/qml/TextArea.qml | 4 ++-- qt6/src/qml/TextField.qml | 2 +- qt6/src/qml/ThemeMenu.qml | 2 +- qt6/src/qml/TipsSlider.qml | 2 +- qt6/src/qml/TitleBar.qml | 6 +++--- qt6/src/qml/ToolButton.qml | 2 +- qt6/src/qml/ToolTip.qml | 2 +- qt6/src/qml/WarningButton.qml | 2 +- qt6/src/qml/WaterProgressBar.qml | 2 +- qt6/src/qml/WindowButton.qml | 2 +- qt6/src/qml/WindowButtonGroup.qml | 6 +++--- qt6/src/qml/WindowQuitFullButton.qml | 2 +- qt6/src/qml/overridable/InWindowBlur.qml | 2 +- qt6/src/qml/private/ArrowListViewButton.qml | 2 +- qt6/src/qml/private/ButtonPanel.qml | 2 +- qt6/src/qml/private/KeySequenceLabel.qml | 2 +- qt6/src/qml/private/ProgressBarImpl.qml | 4 ++-- qt6/src/qml/private/ProgressBarPanel.qml | 2 +- qt6/src/qml/private/SoftwareColorOverlay.qml | 2 +- qt6/src/qml/private/SoftwareOpacityMask.qml | 2 +- qt6/src/qml/settings/CheckBox.qml | 4 ++-- qt6/src/qml/settings/ComboBox.qml | 4 ++-- qt6/src/qml/settings/ContentBackground.qml | 2 +- qt6/src/qml/settings/ContentTitle.qml | 2 +- qt6/src/qml/settings/LineEdit.qml | 4 ++-- qt6/src/qml/settings/NavigationTitle.qml | 2 +- qt6/src/qml/settings/OptionDelegate.qml | 4 ++-- qt6/src/qml/settings/SettingsDialog.qml | 2 +- 111 files changed, 146 insertions(+), 146 deletions(-) diff --git a/qt6/src/qml/AboutAction.qml b/qt6/src/qml/AboutAction.qml index 217b071d..abf36508 100644 --- a/qt6/src/qml/AboutAction.qml +++ b/qt6/src/qml/AboutAction.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick Action { id: control diff --git a/qt6/src/qml/AboutDialog.qml b/qt6/src/qml/AboutDialog.qml index 0e784fa9..2e8cfaff 100644 --- a/qt6/src/qml/AboutDialog.qml +++ b/qt6/src/qml/AboutDialog.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/AbstractButton.qml b/qt6/src/qml/AbstractButton.qml index a729c7bb..fd5f20c7 100644 --- a/qt6/src/qml/AbstractButton.qml +++ b/qt6/src/qml/AbstractButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls AbstractButton { diff --git a/qt6/src/qml/Action.qml b/qt6/src/qml/Action.qml index 541deb68..b5d88e3e 100644 --- a/qt6/src/qml/Action.qml +++ b/qt6/src/qml/Action.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls Action { diff --git a/qt6/src/qml/ActionButton.qml b/qt6/src/qml/ActionButton.qml index 7d5bf063..082b72ba 100644 --- a/qt6/src/qml/ActionButton.qml +++ b/qt6/src/qml/ActionButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ActionGroup.qml b/qt6/src/qml/ActionGroup.qml index a1114dfb..2c4b22f5 100644 --- a/qt6/src/qml/ActionGroup.qml +++ b/qt6/src/qml/ActionGroup.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls ActionGroup { diff --git a/qt6/src/qml/AlertToolTip.qml b/qt6/src/qml/AlertToolTip.qml index 843a0793..6608fb1b 100644 --- a/qt6/src/qml/AlertToolTip.qml +++ b/qt6/src/qml/AlertToolTip.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ApplicationWindow.qml b/qt6/src/qml/ApplicationWindow.qml index dea29441..77cd99c4 100644 --- a/qt6/src/qml/ApplicationWindow.qml +++ b/qt6/src/qml/ApplicationWindow.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D diff --git a/qt6/src/qml/ArrowListView.qml b/qt6/src/qml/ArrowListView.qml index ccc5718b..b8ed23aa 100644 --- a/qt6/src/qml/ArrowListView.qml +++ b/qt6/src/qml/ArrowListView.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/ArrowShapePopup.qml b/qt6/src/qml/ArrowShapePopup.qml index 06596de3..3eb6dd8a 100644 --- a/qt6/src/qml/ArrowShapePopup.qml +++ b/qt6/src/qml/ArrowShapePopup.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 -import QtQuick.Shapes 1.11 +import QtQuick +import QtQuick.Shapes import Qt5Compat.GraphicalEffects import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ArrowShapePopupWindow.qml b/qt6/src/qml/ArrowShapePopupWindow.qml index 5785ecad..b86f7302 100644 --- a/qt6/src/qml/ArrowShapePopupWindow.qml +++ b/qt6/src/qml/ArrowShapePopupWindow.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Window import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/BoxInsetShadow.qml b/qt6/src/qml/BoxInsetShadow.qml index c92d8feb..eab41a9e 100644 --- a/qt6/src/qml/BoxInsetShadow.qml +++ b/qt6/src/qml/BoxInsetShadow.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D Item { diff --git a/qt6/src/qml/BoxPanel.qml b/qt6/src/qml/BoxPanel.qml index 28446375..8d04457c 100644 --- a/qt6/src/qml/BoxPanel.qml +++ b/qt6/src/qml/BoxPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/BoxShadow.qml b/qt6/src/qml/BoxShadow.qml index 023963a1..27b6443d 100644 --- a/qt6/src/qml/BoxShadow.qml +++ b/qt6/src/qml/BoxShadow.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D Item { diff --git a/qt6/src/qml/BusyIndicator.qml b/qt6/src/qml/BusyIndicator.qml index e6cd6c27..239c6f4a 100644 --- a/qt6/src/qml/BusyIndicator.qml +++ b/qt6/src/qml/BusyIndicator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Button.qml b/qt6/src/qml/Button.qml index 3d9418ca..60f84233 100644 --- a/qt6/src/qml/Button.qml +++ b/qt6/src/qml/Button.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ButtonBox.qml b/qt6/src/qml/ButtonBox.qml index 101e843a..a955d57a 100644 --- a/qt6/src/qml/ButtonBox.qml +++ b/qt6/src/qml/ButtonBox.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/ButtonGroup.qml b/qt6/src/qml/ButtonGroup.qml index a2b2ea1a..eceafcc2 100644 --- a/qt6/src/qml/ButtonGroup.qml +++ b/qt6/src/qml/ButtonGroup.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls ButtonGroup { diff --git a/qt6/src/qml/ButtonIndicator.qml b/qt6/src/qml/ButtonIndicator.qml index e628ac02..5ac547ae 100644 --- a/qt6/src/qml/ButtonIndicator.qml +++ b/qt6/src/qml/ButtonIndicator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/CheckBox.qml b/qt6/src/qml/CheckBox.qml index 2a7a0b32..ddc1b085 100644 --- a/qt6/src/qml/CheckBox.qml +++ b/qt6/src/qml/CheckBox.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T -import QtQuick.Layouts 1.11 +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/CheckDelegate.qml b/qt6/src/qml/CheckDelegate.qml index bc98f23d..2345ed5e 100644 --- a/qt6/src/qml/CheckDelegate.qml +++ b/qt6/src/qml/CheckDelegate.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T -import QtQuick.Layouts 1.11 +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/CicleSpreadAnimation.qml b/qt6/src/qml/CicleSpreadAnimation.qml index ba222e1b..cc230482 100644 --- a/qt6/src/qml/CicleSpreadAnimation.qml +++ b/qt6/src/qml/CicleSpreadAnimation.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D Item { diff --git a/qt6/src/qml/ComboBox.qml b/qt6/src/qml/ComboBox.qml index 6e92b7af..ea088e41 100644 --- a/qt6/src/qml/ComboBox.qml +++ b/qt6/src/qml/ComboBox.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Container.qml b/qt6/src/qml/Container.qml index 41684cd1..3cdfc94f 100644 --- a/qt6/src/qml/Container.qml +++ b/qt6/src/qml/Container.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls Container { diff --git a/qt6/src/qml/Control.qml b/qt6/src/qml/Control.qml index 63ab0188..5b400d6d 100644 --- a/qt6/src/qml/Control.qml +++ b/qt6/src/qml/Control.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ControlBackground.qml b/qt6/src/qml/ControlBackground.qml index 122bcf27..073d3fd7 100644 --- a/qt6/src/qml/ControlBackground.qml +++ b/qt6/src/qml/ControlBackground.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick Rectangle { id: control diff --git a/qt6/src/qml/ControlGroup.qml b/qt6/src/qml/ControlGroup.qml index b462f933..3a878540 100644 --- a/qt6/src/qml/ControlGroup.qml +++ b/qt6/src/qml/ControlGroup.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ControlGroupItem.qml b/qt6/src/qml/ControlGroupItem.qml index 65ef0419..7587b232 100644 --- a/qt6/src/qml/ControlGroupItem.qml +++ b/qt6/src/qml/ControlGroupItem.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import QtQml.Models 2.11 import org.deepin.dtk 1.0 as D diff --git a/qt6/src/qml/DelayButton.qml b/qt6/src/qml/DelayButton.qml index 479bd557..58ef8996 100644 --- a/qt6/src/qml/DelayButton.qml +++ b/qt6/src/qml/DelayButton.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Controls.impl 2.4 +import QtQuick +import QtQuick.Controls.impl import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Dial.qml b/qt6/src/qml/Dial.qml index 9c962949..b47e58e9 100644 --- a/qt6/src/qml/Dial.qml +++ b/qt6/src/qml/Dial.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Controls.Basic.impl import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Dialog.qml b/qt6/src/qml/Dialog.qml index d963d4a3..082bfaad 100644 --- a/qt6/src/qml/Dialog.qml +++ b/qt6/src/qml/Dialog.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls Dialog { diff --git a/qt6/src/qml/DialogButtonBox.qml b/qt6/src/qml/DialogButtonBox.qml index 53ae7759..6579fa14 100644 --- a/qt6/src/qml/DialogButtonBox.qml +++ b/qt6/src/qml/DialogButtonBox.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/DragItemsImage.qml b/qt6/src/qml/DragItemsImage.qml index e978a683..a3aff037 100644 --- a/qt6/src/qml/DragItemsImage.qml +++ b/qt6/src/qml/DragItemsImage.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.15 +import QtQuick Item { id: control diff --git a/qt6/src/qml/Drawer.qml b/qt6/src/qml/Drawer.qml index ac744c7a..386e7b1c 100644 --- a/qt6/src/qml/Drawer.qml +++ b/qt6/src/qml/Drawer.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls Drawer { diff --git a/qt6/src/qml/EditPanel.qml b/qt6/src/qml/EditPanel.qml index 99ac9335..b32518ab 100644 --- a/qt6/src/qml/EditPanel.qml +++ b/qt6/src/qml/EditPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/EmbeddedProgressBar.qml b/qt6/src/qml/EmbeddedProgressBar.qml index 87ffb988..41fc19ab 100644 --- a/qt6/src/qml/EmbeddedProgressBar.qml +++ b/qt6/src/qml/EmbeddedProgressBar.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick +import QtQuick.Controls import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/FloatingButton.qml b/qt6/src/qml/FloatingButton.qml index 0fc28b23..ec7c1a0e 100644 --- a/qt6/src/qml/FloatingButton.qml +++ b/qt6/src/qml/FloatingButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/FloatingMessage.qml b/qt6/src/qml/FloatingMessage.qml index 7652ad5f..ca9536b5 100644 --- a/qt6/src/qml/FloatingMessage.qml +++ b/qt6/src/qml/FloatingMessage.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/FloatingPanel.qml b/qt6/src/qml/FloatingPanel.qml index bca43028..325fabe5 100644 --- a/qt6/src/qml/FloatingPanel.qml +++ b/qt6/src/qml/FloatingPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/FlowStyle.qml b/qt6/src/qml/FlowStyle.qml index ff73d8a7..4047be98 100644 --- a/qt6/src/qml/FlowStyle.qml +++ b/qt6/src/qml/FlowStyle.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D QtObject { diff --git a/qt6/src/qml/FocusBoxBorder.qml b/qt6/src/qml/FocusBoxBorder.qml index 97a60b91..5af73306 100644 --- a/qt6/src/qml/FocusBoxBorder.qml +++ b/qt6/src/qml/FocusBoxBorder.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Frame.qml b/qt6/src/qml/Frame.qml index 1f8e0d22..ea77742c 100644 --- a/qt6/src/qml/Frame.qml +++ b/qt6/src/qml/Frame.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/GroupBox.qml b/qt6/src/qml/GroupBox.qml index 95953acd..6148c88f 100644 --- a/qt6/src/qml/GroupBox.qml +++ b/qt6/src/qml/GroupBox.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/HelpAction.qml b/qt6/src/qml/HelpAction.qml index ea3f5925..d75a8bb2 100644 --- a/qt6/src/qml/HelpAction.qml +++ b/qt6/src/qml/HelpAction.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D Action { diff --git a/qt6/src/qml/HighlightPanel.qml b/qt6/src/qml/HighlightPanel.qml index 57357ea4..ea78ee77 100644 --- a/qt6/src/qml/HighlightPanel.qml +++ b/qt6/src/qml/HighlightPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/IconButton.qml b/qt6/src/qml/IconButton.qml index f4929fd7..547f5ad6 100644 --- a/qt6/src/qml/IconButton.qml +++ b/qt6/src/qml/IconButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private as P diff --git a/qt6/src/qml/InsideBoxBorder.qml b/qt6/src/qml/InsideBoxBorder.qml index 22382420..266c9268 100644 --- a/qt6/src/qml/InsideBoxBorder.qml +++ b/qt6/src/qml/InsideBoxBorder.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Window Item { // The width of the window's inner and outer borders do not change as the screen scales, and always remain 1px size diff --git a/qt6/src/qml/IpV4LineEdit.qml b/qt6/src/qml/IpV4LineEdit.qml index 63f59234..bd178399 100644 --- a/qt6/src/qml/IpV4LineEdit.qml +++ b/qt6/src/qml/IpV4LineEdit.qml @@ -3,7 +3,7 @@ // SPDX-License-Identifier: LGPL-3.0-or-later import QtQuick -import QtQuick.Layouts 1.11 +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ItemDelegate.qml b/qt6/src/qml/ItemDelegate.qml index 5ea80653..3f9af520 100644 --- a/qt6/src/qml/ItemDelegate.qml +++ b/qt6/src/qml/ItemDelegate.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Layouts 1.11 +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/KeySequenceEdit.qml b/qt6/src/qml/KeySequenceEdit.qml index c7d10806..3fb515a1 100644 --- a/qt6/src/qml/KeySequenceEdit.qml +++ b/qt6/src/qml/KeySequenceEdit.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/Label.qml b/qt6/src/qml/Label.qml index 3f0a35b8..5e95d404 100644 --- a/qt6/src/qml/Label.qml +++ b/qt6/src/qml/Label.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls Label { opacity: enabled ? 1 : 0.4 diff --git a/qt6/src/qml/LineEdit.qml b/qt6/src/qml/LineEdit.qml index 1ea7249d..e494b2db 100644 --- a/qt6/src/qml/LineEdit.qml +++ b/qt6/src/qml/LineEdit.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ListView.qml b/qt6/src/qml/ListView.qml index de0a4200..4dfe99db 100644 --- a/qt6/src/qml/ListView.qml +++ b/qt6/src/qml/ListView.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.15 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Menu.qml b/qt6/src/qml/Menu.qml index 36549ea3..d24ec490 100644 --- a/qt6/src/qml/Menu.qml +++ b/qt6/src/qml/Menu.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/MenuBar.qml b/qt6/src/qml/MenuBar.qml index e58d9369..cd4cd7ff 100644 --- a/qt6/src/qml/MenuBar.qml +++ b/qt6/src/qml/MenuBar.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls MenuBar { diff --git a/qt6/src/qml/MenuItem.qml b/qt6/src/qml/MenuItem.qml index 61fffa75..38cf54c7 100644 --- a/qt6/src/qml/MenuItem.qml +++ b/qt6/src/qml/MenuItem.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/MenuSeparator.qml b/qt6/src/qml/MenuSeparator.qml index 7081ec38..d5e376c7 100644 --- a/qt6/src/qml/MenuSeparator.qml +++ b/qt6/src/qml/MenuSeparator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/OutsideBoxBorder.qml b/qt6/src/qml/OutsideBoxBorder.qml index 25392291..04cad682 100644 --- a/qt6/src/qml/OutsideBoxBorder.qml +++ b/qt6/src/qml/OutsideBoxBorder.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick Item { property real borderWidth: 1 diff --git a/qt6/src/qml/PageIndicator.qml b/qt6/src/qml/PageIndicator.qml index 894addfc..d28f2bc8 100644 --- a/qt6/src/qml/PageIndicator.qml +++ b/qt6/src/qml/PageIndicator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/PasswordEdit.qml b/qt6/src/qml/PasswordEdit.qml index 19155b04..2878f0c9 100644 --- a/qt6/src/qml/PasswordEdit.qml +++ b/qt6/src/qml/PasswordEdit.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/PlaceholderText.qml b/qt6/src/qml/PlaceholderText.qml index ab3491d7..4fb78ffd 100644 --- a/qt6/src/qml/PlaceholderText.qml +++ b/qt6/src/qml/PlaceholderText.qml @@ -3,8 +3,8 @@ // SPDX-License-Identifier: LGPL-3.0-or-later import QtQuick -import QtQuick.Controls 2.4 -import QtQuick.Controls.impl 2.4 as I +import QtQuick.Controls +import QtQuick.Controls.impl as I I.PlaceholderText { elide: Text.ElideRight diff --git a/qt6/src/qml/PlusMinusSpinBox.qml b/qt6/src/qml/PlusMinusSpinBox.qml index dec648df..1ef5b2a4 100644 --- a/qt6/src/qml/PlusMinusSpinBox.qml +++ b/qt6/src/qml/PlusMinusSpinBox.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk.style 1.0 as DS FocusScope { diff --git a/qt6/src/qml/Popup.qml b/qt6/src/qml/Popup.qml index 3127e2b8..9cb01484 100644 --- a/qt6/src/qml/Popup.qml +++ b/qt6/src/qml/Popup.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Window import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/PopupWindow.qml b/qt6/src/qml/PopupWindow.qml index b666311f..336f561d 100644 --- a/qt6/src/qml/PopupWindow.qml +++ b/qt6/src/qml/PopupWindow.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Window import org.deepin.dtk 1.0 as D Window { diff --git a/qt6/src/qml/ProgressBar.qml b/qt6/src/qml/ProgressBar.qml index d177a4f2..5df96db0 100644 --- a/qt6/src/qml/ProgressBar.qml +++ b/qt6/src/qml/ProgressBar.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private 1.0 as P diff --git a/qt6/src/qml/QuitAction.qml b/qt6/src/qml/QuitAction.qml index c83bcb64..57e6071d 100644 --- a/qt6/src/qml/QuitAction.qml +++ b/qt6/src/qml/QuitAction.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick Action { id: quitAction diff --git a/qt6/src/qml/RadioButton.qml b/qt6/src/qml/RadioButton.qml index 1fc4e169..35cb72c0 100644 --- a/qt6/src/qml/RadioButton.qml +++ b/qt6/src/qml/RadioButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/RectangularShadow.qml b/qt6/src/qml/RectangularShadow.qml index 4f7daf10..b15fc2f2 100644 --- a/qt6/src/qml/RectangularShadow.qml +++ b/qt6/src/qml/RectangularShadow.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D Item { diff --git a/qt6/src/qml/ScrollBar.qml b/qt6/src/qml/ScrollBar.qml index 240bca1f..b7b9e4ba 100644 --- a/qt6/src/qml/ScrollBar.qml +++ b/qt6/src/qml/ScrollBar.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ScrollIndicator.qml b/qt6/src/qml/ScrollIndicator.qml index c523fb15..936e546f 100644 --- a/qt6/src/qml/ScrollIndicator.qml +++ b/qt6/src/qml/ScrollIndicator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T T.ScrollIndicator { diff --git a/qt6/src/qml/ScrollView.qml b/qt6/src/qml/ScrollView.qml index 6e8b8d45..e341191d 100644 --- a/qt6/src/qml/ScrollView.qml +++ b/qt6/src/qml/ScrollView.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls ScrollView { diff --git a/qt6/src/qml/SearchEdit.qml b/qt6/src/qml/SearchEdit.qml index 263a64ec..240787c9 100644 --- a/qt6/src/qml/SearchEdit.qml +++ b/qt6/src/qml/SearchEdit.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/Slider.qml b/qt6/src/qml/Slider.qml index 8e9fecf0..0a3fd145 100644 --- a/qt6/src/qml/Slider.qml +++ b/qt6/src/qml/Slider.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Shapes 1.11 +import QtQuick +import QtQuick.Shapes import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/SliderHandle.qml b/qt6/src/qml/SliderHandle.qml index 1e26b141..c025512b 100644 --- a/qt6/src/qml/SliderHandle.qml +++ b/qt6/src/qml/SliderHandle.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D D.DciIcon { diff --git a/qt6/src/qml/SliderTipItem.qml b/qt6/src/qml/SliderTipItem.qml index 4dfe58e4..0ea1e845 100644 --- a/qt6/src/qml/SliderTipItem.qml +++ b/qt6/src/qml/SliderTipItem.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/SortFilterModel.qml b/qt6/src/qml/SortFilterModel.qml index 94a507d2..3eb3f0e4 100644 --- a/qt6/src/qml/SortFilterModel.qml +++ b/qt6/src/qml/SortFilterModel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQml.Models 2.11 DelegateModel { diff --git a/qt6/src/qml/SpinBox.qml b/qt6/src/qml/SpinBox.qml index 7774a731..333737ee 100644 --- a/qt6/src/qml/SpinBox.qml +++ b/qt6/src/qml/SpinBox.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/SpinBoxIndicator.qml b/qt6/src/qml/SpinBoxIndicator.qml index fda50711..dbe538d7 100644 --- a/qt6/src/qml/SpinBoxIndicator.qml +++ b/qt6/src/qml/SpinBoxIndicator.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.private as P diff --git a/qt6/src/qml/StackView.qml b/qt6/src/qml/StackView.qml index da45bef4..46eba07e 100644 --- a/qt6/src/qml/StackView.qml +++ b/qt6/src/qml/StackView.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/SwipeDelegate.qml b/qt6/src/qml/SwipeDelegate.qml index 15b12488..fc2820b9 100644 --- a/qt6/src/qml/SwipeDelegate.qml +++ b/qt6/src/qml/SwipeDelegate.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls SwipeDelegate { diff --git a/qt6/src/qml/SwipeView.qml b/qt6/src/qml/SwipeView.qml index 1488201c..872474aa 100644 --- a/qt6/src/qml/SwipeView.qml +++ b/qt6/src/qml/SwipeView.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls SwipeView { diff --git a/qt6/src/qml/Switch.qml b/qt6/src/qml/Switch.qml index 71324a7f..8671af61 100644 --- a/qt6/src/qml/Switch.qml +++ b/qt6/src/qml/Switch.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/TabBar.qml b/qt6/src/qml/TabBar.qml index 1b6e02e7..a0454c5f 100644 --- a/qt6/src/qml/TabBar.qml +++ b/qt6/src/qml/TabBar.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick.Controls 2.4 +import QtQuick.Controls TabBar { diff --git a/qt6/src/qml/TextArea.qml b/qt6/src/qml/TextArea.qml index edccf7ca..4e0d26e9 100644 --- a/qt6/src/qml/TextArea.qml +++ b/qt6/src/qml/TextArea.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Controls.impl 2.4 +import QtQuick +import QtQuick.Controls.impl import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/TextField.qml b/qt6/src/qml/TextField.qml index 47985026..ac72129a 100644 --- a/qt6/src/qml/TextField.qml +++ b/qt6/src/qml/TextField.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ThemeMenu.qml b/qt6/src/qml/ThemeMenu.qml index 8bd4d574..3197bf06 100644 --- a/qt6/src/qml/ThemeMenu.qml +++ b/qt6/src/qml/ThemeMenu.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D Menu { diff --git a/qt6/src/qml/TipsSlider.qml b/qt6/src/qml/TipsSlider.qml index 288a2333..7c19ba6f 100644 --- a/qt6/src/qml/TipsSlider.qml +++ b/qt6/src/qml/TipsSlider.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/TitleBar.qml b/qt6/src/qml/TitleBar.qml index 8bc1a481..bd89b297 100644 --- a/qt6/src/qml/TitleBar.qml +++ b/qt6/src/qml/TitleBar.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ToolButton.qml b/qt6/src/qml/ToolButton.qml index b7c7b6be..ad7ef9dc 100644 --- a/qt6/src/qml/ToolButton.qml +++ b/qt6/src/qml/ToolButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/ToolTip.qml b/qt6/src/qml/ToolTip.qml index 99c4beca..957d5514 100644 --- a/qt6/src/qml/ToolTip.qml +++ b/qt6/src/qml/ToolTip.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Templates as T import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/WarningButton.qml b/qt6/src/qml/WarningButton.qml index e7032569..9127b211 100644 --- a/qt6/src/qml/WarningButton.qml +++ b/qt6/src/qml/WarningButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/WaterProgressBar.qml b/qt6/src/qml/WaterProgressBar.qml index e2c80743..31a9828b 100644 --- a/qt6/src/qml/WaterProgressBar.qml +++ b/qt6/src/qml/WaterProgressBar.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/WindowButton.qml b/qt6/src/qml/WindowButton.qml index 2fc150a1..2b5a8334 100644 --- a/qt6/src/qml/WindowButton.qml +++ b/qt6/src/qml/WindowButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/WindowButtonGroup.qml b/qt6/src/qml/WindowButtonGroup.qml index e976af8c..020bca28 100644 --- a/qt6/src/qml/WindowButtonGroup.qml +++ b/qt6/src/qml/WindowButtonGroup.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/WindowQuitFullButton.qml b/qt6/src/qml/WindowQuitFullButton.qml index 46c5ae76..89e23951 100644 --- a/qt6/src/qml/WindowQuitFullButton.qml +++ b/qt6/src/qml/WindowQuitFullButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk.controls 1.0 Button { diff --git a/qt6/src/qml/overridable/InWindowBlur.qml b/qt6/src/qml/overridable/InWindowBlur.qml index 992133b0..38402715 100644 --- a/qt6/src/qml/overridable/InWindowBlur.qml +++ b/qt6/src/qml/overridable/InWindowBlur.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import QtQuick.Effects import org.deepin.dtk 1.0 as D diff --git a/qt6/src/qml/private/ArrowListViewButton.qml b/qt6/src/qml/private/ArrowListViewButton.qml index 44ce410d..c11219ee 100644 --- a/qt6/src/qml/private/ArrowListViewButton.qml +++ b/qt6/src/qml/private/ArrowListViewButton.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/private/ButtonPanel.qml b/qt6/src/qml/private/ButtonPanel.qml index a77aa8bb..7396434f 100644 --- a/qt6/src/qml/private/ButtonPanel.qml +++ b/qt6/src/qml/private/ButtonPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/private/KeySequenceLabel.qml b/qt6/src/qml/private/KeySequenceLabel.qml index 17bd3435..b343d0f4 100644 --- a/qt6/src/qml/private/KeySequenceLabel.qml +++ b/qt6/src/qml/private/KeySequenceLabel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk diff --git a/qt6/src/qml/private/ProgressBarImpl.qml b/qt6/src/qml/private/ProgressBarImpl.qml index dd29b673..22b1a8f6 100644 --- a/qt6/src/qml/private/ProgressBarImpl.qml +++ b/qt6/src/qml/private/ProgressBarImpl.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Controls.impl 2.4 +import QtQuick +import QtQuick.Controls.impl import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/private/ProgressBarPanel.qml b/qt6/src/qml/private/ProgressBarPanel.qml index 92482f47..a40f365f 100644 --- a/qt6/src/qml/private/ProgressBarPanel.qml +++ b/qt6/src/qml/private/ProgressBarPanel.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/private/SoftwareColorOverlay.qml b/qt6/src/qml/private/SoftwareColorOverlay.qml index 2e9f2c61..d64e723e 100644 --- a/qt6/src/qml/private/SoftwareColorOverlay.qml +++ b/qt6/src/qml/private/SoftwareColorOverlay.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import Qt5Compat.GraphicalEffects.private import org.deepin.dtk 1.0 as D diff --git a/qt6/src/qml/private/SoftwareOpacityMask.qml b/qt6/src/qml/private/SoftwareOpacityMask.qml index 2ba8bfff..a36a0029 100644 --- a/qt6/src/qml/private/SoftwareOpacityMask.qml +++ b/qt6/src/qml/private/SoftwareOpacityMask.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.0 +import QtQuick import Qt5Compat.GraphicalEffects.private import org.deepin.dtk 1.0 as D diff --git a/qt6/src/qml/settings/CheckBox.qml b/qt6/src/qml/settings/CheckBox.qml index ec6b1455..95b75fd1 100644 --- a/qt6/src/qml/settings/CheckBox.qml +++ b/qt6/src/qml/settings/CheckBox.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk 1.0 as D import org.deepin.dtk.settings 1.0 as Settings import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/settings/ComboBox.qml b/qt6/src/qml/settings/ComboBox.qml index 267525cf..87eed2c5 100644 --- a/qt6/src/qml/settings/ComboBox.qml +++ b/qt6/src/qml/settings/ComboBox.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk.settings 1.0 as Settings import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/settings/ContentBackground.qml b/qt6/src/qml/settings/ContentBackground.qml index 1ad2ff6d..0796899a 100644 --- a/qt6/src/qml/settings/ContentBackground.qml +++ b/qt6/src/qml/settings/ContentBackground.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.settings 1.0 import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/settings/ContentTitle.qml b/qt6/src/qml/settings/ContentTitle.qml index d7c6ba41..1f84e68a 100644 --- a/qt6/src/qml/settings/ContentTitle.qml +++ b/qt6/src/qml/settings/ContentTitle.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.settings 1.0 as Settings import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/settings/LineEdit.qml b/qt6/src/qml/settings/LineEdit.qml index e24f27a3..321f29dd 100644 --- a/qt6/src/qml/settings/LineEdit.qml +++ b/qt6/src/qml/settings/LineEdit.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk.settings 1.0 as Settings import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/settings/NavigationTitle.qml b/qt6/src/qml/settings/NavigationTitle.qml index 9ad53a9d..0520f41e 100644 --- a/qt6/src/qml/settings/NavigationTitle.qml +++ b/qt6/src/qml/settings/NavigationTitle.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.settings 1.0 as Settings import org.deepin.dtk.style 1.0 as DS diff --git a/qt6/src/qml/settings/OptionDelegate.qml b/qt6/src/qml/settings/OptionDelegate.qml index 07354053..f5477449 100644 --- a/qt6/src/qml/settings/OptionDelegate.qml +++ b/qt6/src/qml/settings/OptionDelegate.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import org.deepin.dtk.settings 1.0 import org.deepin.dtk 1.0 diff --git a/qt6/src/qml/settings/SettingsDialog.qml b/qt6/src/qml/settings/SettingsDialog.qml index c3a62435..e5c3f6bd 100644 --- a/qt6/src/qml/settings/SettingsDialog.qml +++ b/qt6/src/qml/settings/SettingsDialog.qml @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -import QtQuick 2.11 +import QtQuick import org.deepin.dtk 1.0 as D import org.deepin.dtk.style 1.0 as DS import org.deepin.dtk.settings 1.0 as Settings