From 51e210ab7b688f7973a51b9702355a3c0737fab1 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Thu, 15 May 2025 11:11:25 +0800 Subject: [PATCH] Qt5: Update QtGraphicalEffects, RibbonUI version to latest --- example/qml/Qt5/about.qml | 2 +- example/qml/Qt5/components/RibbonMessageListViewExample.qml | 2 +- example/qml/Qt5/components/TabBar.qml | 2 +- example/qml/Qt5/example.qml | 2 +- example/qml/Qt5/pages/SettingsMenuPage.qml | 2 +- example/qml/Qt6/example.qml | 1 + lib_source/qml/Qt5/RibbonBlur.qml | 2 +- lib_source/qml/Qt5/RibbonBusyBar.qml | 2 +- lib_source/qml/Qt5/RibbonPopup.qml | 2 +- lib_source/qml/Qt5/RibbonProgressBar.qml | 2 +- lib_source/qml/Qt5/RibbonRectangle.qml | 2 +- lib_source/qml/Qt5/RibbonShadow.qml | 2 +- lib_source/qml/Qt5/RibbonSlider.qml | 2 +- lib_source/qml/Qt5/RibbonTabBar.qml | 2 +- lib_source/qml/Qt5/RibbonToolTip.qml | 2 +- lib_source/qml/Qt5/RibbonTour.qml | 2 +- lib_source/qml/Qt5/RibbonView.qml | 2 +- 17 files changed, 17 insertions(+), 16 deletions(-) diff --git a/example/qml/Qt5/about.qml b/example/qml/Qt5/about.qml index 1abcd56..fe174d7 100644 --- a/example/qml/Qt5/about.qml +++ b/example/qml/Qt5/about.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.11 import QtQuick.Controls 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonWindow { id: window diff --git a/example/qml/Qt5/components/RibbonMessageListViewExample.qml b/example/qml/Qt5/components/RibbonMessageListViewExample.qml index c584cb5..07cc73b 100644 --- a/example/qml/Qt5/components/RibbonMessageListViewExample.qml +++ b/example/qml/Qt5/components/RibbonMessageListViewExample.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 -import RibbonUI 1.0 +import RibbonUI 1.1 Item { id: root diff --git a/example/qml/Qt5/components/TabBar.qml b/example/qml/Qt5/components/TabBar.qml index 3c2e5b1..faacc31 100644 --- a/example/qml/Qt5/components/TabBar.qml +++ b/example/qml/Qt5/components/TabBar.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.11 import QtQuick.Controls 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonTabBar { id: tab_bar diff --git a/example/qml/Qt5/example.qml b/example/qml/Qt5/example.qml index ba40e7c..7de2706 100644 --- a/example/qml/Qt5/example.qml +++ b/example/qml/Qt5/example.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import QtQuick.Window 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 import "components" RibbonWindow { diff --git a/example/qml/Qt5/pages/SettingsMenuPage.qml b/example/qml/Qt5/pages/SettingsMenuPage.qml index 26bfb86..809f47a 100644 --- a/example/qml/Qt5/pages/SettingsMenuPage.qml +++ b/example/qml/Qt5/pages/SettingsMenuPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.11 import QtQuick.Controls 2.15 import QtQuick.Window 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonBackStagePage{ id: page diff --git a/example/qml/Qt6/example.qml b/example/qml/Qt6/example.qml index 169a996..8dc7a90 100644 --- a/example/qml/Qt6/example.qml +++ b/example/qml/Qt6/example.qml @@ -157,6 +157,7 @@ RibbonWindow { pageWidth: (page_slider.value / 100.0) * width spacing: 0 isMainView: true + ColumnLayout{ Layout.alignment: Qt.AlignCenter Layout.topMargin: 30 diff --git a/lib_source/qml/Qt5/RibbonBlur.qml b/lib_source/qml/Qt5/RibbonBlur.qml index a513533..e9f37ad 100644 --- a/lib_source/qml/Qt5/RibbonBlur.qml +++ b/lib_source/qml/Qt5/RibbonBlur.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 RibbonRectangle { diff --git a/lib_source/qml/Qt5/RibbonBusyBar.qml b/lib_source/qml/Qt5/RibbonBusyBar.qml index 1d632ed..1ad3cc3 100644 --- a/lib_source/qml/Qt5/RibbonBusyBar.qml +++ b/lib_source/qml/Qt5/RibbonBusyBar.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 BusyIndicator { diff --git a/lib_source/qml/Qt5/RibbonPopup.qml b/lib_source/qml/Qt5/RibbonPopup.qml index 3824e9a..9f4bf5f 100644 --- a/lib_source/qml/Qt5/RibbonPopup.qml +++ b/lib_source/qml/Qt5/RibbonPopup.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts 1.11 import QtQuick.Controls 2.15 import QtQuick.Window 2.15 import RibbonUI 1.1 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 Popup { id: popup diff --git a/lib_source/qml/Qt5/RibbonProgressBar.qml b/lib_source/qml/Qt5/RibbonProgressBar.qml index 5130dd3..4c47c5f 100644 --- a/lib_source/qml/Qt5/RibbonProgressBar.qml +++ b/lib_source/qml/Qt5/RibbonProgressBar.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 Item{ diff --git a/lib_source/qml/Qt5/RibbonRectangle.qml b/lib_source/qml/Qt5/RibbonRectangle.qml index 644b58f..9b73e12 100644 --- a/lib_source/qml/Qt5/RibbonRectangle.qml +++ b/lib_source/qml/Qt5/RibbonRectangle.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Shapes 1.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 Item { id: control diff --git a/lib_source/qml/Qt5/RibbonShadow.qml b/lib_source/qml/Qt5/RibbonShadow.qml index 22cc02a..49db9c6 100644 --- a/lib_source/qml/Qt5/RibbonShadow.qml +++ b/lib_source/qml/Qt5/RibbonShadow.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 DropShadow { diff --git a/lib_source/qml/Qt5/RibbonSlider.qml b/lib_source/qml/Qt5/RibbonSlider.qml index 461de0e..5b89ba3 100644 --- a/lib_source/qml/Qt5/RibbonSlider.qml +++ b/lib_source/qml/Qt5/RibbonSlider.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 Item { diff --git a/lib_source/qml/Qt5/RibbonTabBar.qml b/lib_source/qml/Qt5/RibbonTabBar.qml index 8069e11..b2f3f3b 100644 --- a/lib_source/qml/Qt5/RibbonTabBar.qml +++ b/lib_source/qml/Qt5/RibbonTabBar.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import QtQuick.Window 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 Item{ diff --git a/lib_source/qml/Qt5/RibbonToolTip.qml b/lib_source/qml/Qt5/RibbonToolTip.qml index 00105cc..53279da 100644 --- a/lib_source/qml/Qt5/RibbonToolTip.qml +++ b/lib_source/qml/Qt5/RibbonToolTip.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 ToolTip { diff --git a/lib_source/qml/Qt5/RibbonTour.qml b/lib_source/qml/Qt5/RibbonTour.qml index 90ea53d..d578016 100644 --- a/lib_source/qml/Qt5/RibbonTour.qml +++ b/lib_source/qml/Qt5/RibbonTour.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import RibbonUI 1.1 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 Popup { id: popup diff --git a/lib_source/qml/Qt5/RibbonView.qml b/lib_source/qml/Qt5/RibbonView.qml index b27ba84..0b3f2ea 100644 --- a/lib_source/qml/Qt5/RibbonView.qml +++ b/lib_source/qml/Qt5/RibbonView.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.11 import QtQuick.Window 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import RibbonUI 1.1 Item {