From adc3558e0282135054de51e2081a2e925fb6618c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 20 Jun 2023 19:02:18 +0800 Subject: [PATCH] update .gitignore --- doc/preview/demo_content_dialog.png | Bin doc/preview/demo_filledbtn.png | Bin doc/preview/demo_icon.png | Bin doc/preview/demo_infobar.png | Bin doc/preview/demo_large.png | Bin doc/preview/demo_multiline_textbox.png | Bin doc/preview/demo_progress_bar_ring.png | Bin doc/preview/demo_radiobtn.png | Bin doc/preview/demo_rectangle.png | Bin doc/preview/demo_slider.png | Bin doc/preview/demo_standardbtn.png | Bin doc/preview/demo_textbox.png | Bin doc/preview/demo_textbtn.png | Bin doc/preview/demo_toggle_switch.png | Bin doc/preview/demo_tooltip.png | Bin doc/preview/demo_tree_view.png | Bin doc/preview/qt_creator_project.png | Bin example/CMakeLists.txt | 2 +- example/qml/page/T_Acrylic.qml | 1 + src/CMakeLists.txt | 2 +- 20 files changed, 3 insertions(+), 2 deletions(-) mode change 100755 => 100644 doc/preview/demo_content_dialog.png mode change 100755 => 100644 doc/preview/demo_filledbtn.png mode change 100755 => 100644 doc/preview/demo_icon.png mode change 100755 => 100644 doc/preview/demo_infobar.png mode change 100755 => 100644 doc/preview/demo_large.png mode change 100755 => 100644 doc/preview/demo_multiline_textbox.png mode change 100755 => 100644 doc/preview/demo_progress_bar_ring.png mode change 100755 => 100644 doc/preview/demo_radiobtn.png mode change 100755 => 100644 doc/preview/demo_rectangle.png mode change 100755 => 100644 doc/preview/demo_slider.png mode change 100755 => 100644 doc/preview/demo_standardbtn.png mode change 100755 => 100644 doc/preview/demo_textbox.png mode change 100755 => 100644 doc/preview/demo_textbtn.png mode change 100755 => 100644 doc/preview/demo_toggle_switch.png mode change 100755 => 100644 doc/preview/demo_tooltip.png mode change 100755 => 100644 doc/preview/demo_tree_view.png mode change 100755 => 100644 doc/preview/qt_creator_project.png diff --git a/doc/preview/demo_content_dialog.png b/doc/preview/demo_content_dialog.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_filledbtn.png b/doc/preview/demo_filledbtn.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_icon.png b/doc/preview/demo_icon.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_infobar.png b/doc/preview/demo_infobar.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_large.png b/doc/preview/demo_large.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_multiline_textbox.png b/doc/preview/demo_multiline_textbox.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_progress_bar_ring.png b/doc/preview/demo_progress_bar_ring.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_radiobtn.png b/doc/preview/demo_radiobtn.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_rectangle.png b/doc/preview/demo_rectangle.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_slider.png b/doc/preview/demo_slider.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_standardbtn.png b/doc/preview/demo_standardbtn.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_textbox.png b/doc/preview/demo_textbox.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_textbtn.png b/doc/preview/demo_textbtn.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_toggle_switch.png b/doc/preview/demo_toggle_switch.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_tooltip.png b/doc/preview/demo_tooltip.png old mode 100755 new mode 100644 diff --git a/doc/preview/demo_tree_view.png b/doc/preview/demo_tree_view.png old mode 100755 new mode 100644 diff --git a/doc/preview/qt_creator_project.png b/doc/preview/qt_creator_project.png old mode 100755 new mode 100644 diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index f0c480e4..2186e660 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -20,7 +20,7 @@ endif() file(TO_CMAKE_PATH "/" PATH_SEPARATOR) #设置版本号 -add_definitions(-DVERSION=1,3,6) +add_definitions(-DVERSION=1,3,6,0) find_package(Qt6 REQUIRED COMPONENTS Quick) qt_standard_project_setup() diff --git a/example/qml/page/T_Acrylic.qml b/example/qml/page/T_Acrylic.qml index 6a09b271..3c625222 100644 --- a/example/qml/page/T_Acrylic.qml +++ b/example/qml/page/T_Acrylic.qml @@ -58,6 +58,7 @@ FluScrollablePage{ width: 100 height: 100 anchors.centerIn: parent + } }' } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 06bbc421..19311b13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,7 @@ endif() set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) #设置版本号 -add_definitions(-DVERSION=1,3,6) +add_definitions(-DVERSION=1,3,6,0) find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) qt_standard_project_setup()