diff --git a/example/App.qml b/example/App.qml index 6e3f4be..f474c03 100644 --- a/example/App.qml +++ b/example/App.qml @@ -1,8 +1,10 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects +import QtMultimedia +import FluentUI Window { id:app diff --git a/example/T_Awesome.qml b/example/T_Awesome.qml index e3e23fa..c929543 100644 --- a/example/T_Awesome.qml +++ b/example/T_Awesome.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluContentPage { diff --git a/example/T_Badge.qml b/example/T_Badge.qml index cdf7e57..9832ce2 100644 --- a/example/T_Badge.qml +++ b/example/T_Badge.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Buttons.qml b/example/T_Buttons.qml index 8fd2093..5dbfc57 100644 --- a/example/T_Buttons.qml +++ b/example/T_Buttons.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Buttons" diff --git a/example/T_CalendarPicker.qml b/example/T_CalendarPicker.qml index 3b85806..4af8403 100644 --- a/example/T_CalendarPicker.qml +++ b/example/T_CalendarPicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Carousel.qml b/example/T_Carousel.qml index 05211cd..ffb2905 100644 --- a/example/T_Carousel.qml +++ b/example/T_Carousel.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_ColorPicker.qml b/example/T_ColorPicker.qml index a110172..b2378a8 100644 --- a/example/T_ColorPicker.qml +++ b/example/T_ColorPicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_DatePicker.qml b/example/T_DatePicker.qml index 2e2db6b..d25e98c 100644 --- a/example/T_DatePicker.qml +++ b/example/T_DatePicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Dialog.qml b/example/T_Dialog.qml index 8737bd6..7a54430 100644 --- a/example/T_Dialog.qml +++ b/example/T_Dialog.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Dialog" diff --git a/example/T_Expander.qml b/example/T_Expander.qml index 1b285e1..b694a49 100644 --- a/example/T_Expander.qml +++ b/example/T_Expander.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ title:"Expander" diff --git a/example/T_InfoBar.qml b/example/T_InfoBar.qml index d7137cb..f6226d2 100644 --- a/example/T_InfoBar.qml +++ b/example/T_InfoBar.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"InfoBar" diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml index 853e4b2..d7bd23e 100644 --- a/example/T_MediaPlayer.qml +++ b/example/T_MediaPlayer.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window import Qt5Compat.GraphicalEffects -import FluentUI 1.0 +import FluentUI FluScrollablePage{ diff --git a/example/T_Menu.qml b/example/T_Menu.qml index 33fcfa2..927f980 100644 --- a/example/T_Menu.qml +++ b/example/T_Menu.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_MultiWindow.qml b/example/T_MultiWindow.qml index f63f9d4..de5e2c3 100644 --- a/example/T_MultiWindow.qml +++ b/example/T_MultiWindow.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Progress.qml b/example/T_Progress.qml index 9844201..150bfd5 100644 --- a/example/T_Progress.qml +++ b/example/T_Progress.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Progress" diff --git a/example/T_Rectangle.qml b/example/T_Rectangle.qml index daa817f..6f59c95 100644 --- a/example/T_Rectangle.qml +++ b/example/T_Rectangle.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window +import FluentUI FluScrollablePage{ title:"Rectangle" diff --git a/example/T_Slider.qml b/example/T_Slider.qml index 9ff659a..557c63d 100644 --- a/example/T_Slider.qml +++ b/example/T_Slider.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_TextBox.qml b/example/T_TextBox.qml index 85235af..bd74d10 100644 --- a/example/T_TextBox.qml +++ b/example/T_TextBox.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Theme.qml b/example/T_Theme.qml index a3e3c86..c7f6232 100644 --- a/example/T_Theme.qml +++ b/example/T_Theme.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_TimePicker.qml b/example/T_TimePicker.qml index 05a2684..aec1bbc 100644 --- a/example/T_TimePicker.qml +++ b/example/T_TimePicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_ToggleSwitch.qml b/example/T_ToggleSwitch.qml index afbd329..9b8cbc4 100644 --- a/example/T_ToggleSwitch.qml +++ b/example/T_ToggleSwitch.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Tooltip.qml b/example/T_Tooltip.qml index 885df12..ebb526c 100644 --- a/example/T_Tooltip.qml +++ b/example/T_Tooltip.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_TreeView.qml b/example/T_TreeView.qml index d39f0c7..f75faad 100644 --- a/example/T_TreeView.qml +++ b/example/T_TreeView.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluContentPage { diff --git a/example/T_Typography.qml b/example/T_Typography.qml index 1f2eb2c..5636a2c 100644 --- a/example/T_Typography.qml +++ b/example/T_Typography.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import FluentUI FluContentPage { diff --git a/example/example.pro b/example/example.pro index 451817a..da5a875 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,5 +1,5 @@ -QT += quick quickcontrols2 concurrent network -CONFIG += c++11 +QT += quick quickcontrols2 concurrent network multimedia core5compat +CONFIG += c++17 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 9b23f2e..56586ed 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import FluentUI FluWindow { diff --git a/example/page/LoginPage.qml b/example/page/LoginPage.qml index 15a7da4..76e069c 100644 --- a/example/page/LoginPage.qml +++ b/example/page/LoginPage.qml @@ -1,6 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import FluentUI FluWindow { diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml index bf3a1fd..776afd9 100644 --- a/example/page/MainPage.qml +++ b/example/page/MainPage.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts -import FluentUI 1.0 +import FluentUI FluWindow { id:rootwindow diff --git a/src/FluentUI.pro b/src/FluentUI.pro index ffe1036..06e1a29 100644 --- a/src/FluentUI.pro +++ b/src/FluentUI.pro @@ -1,5 +1,5 @@ QT += qml quick svg -CONFIG += plugin c++11 +CONFIG += plugin c++17 TEMPLATE = lib TARGET = FluentUI TARGET = $$qtLibraryTarget($$TARGET) diff --git a/src/controls/FluTextButton.qml b/src/controls/FluTextButton.qml index 5b4b034..a196524 100644 --- a/src/controls/FluTextButton.qml +++ b/src/controls/FluTextButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import FluentUI Button {