update workflows

.github/workflows/macos.yml

@@ -60,7 +60,7 @@ jobs:
           # 拷贝依赖
           sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg     
           
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: bin/release/${{ env.targetName }}.app

.github/workflows/ubuntu.yml

@@ -77,7 +77,7 @@ jobs:
           linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
         
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: ${{ env.targetName }}.AppImage

.github/workflows/windows-mingw.yml

@@ -82,7 +82,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"       
       
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

.github/workflows/windows-qt5.yml

@@ -69,7 +69,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

.github/workflows/windows.yml

@@ -76,7 +76,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist

example/example_en_US.ts

@@ -1494,27 +1494,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="84"/>
+        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="85"/>
         <source>close &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="84"/>
+        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="85"/>
         <source>show &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="70"/>
-        <location filename="qml/page/T_InfoBar.qml" line="80"/>
-        <location filename="qml/page/T_InfoBar.qml" line="90"/>
+        <location filename="qml/page/T_InfoBar.qml" line="81"/>
+        <location filename="qml/page/T_InfoBar.qml" line="91"/>
         <source>This is an &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_InfoBar.qml" line="94"/>
+        <location filename="qml/page/T_InfoBar.qml" line="95"/>
         <source>clear all info</source>
         <translation type="unfinished"></translation>
     </message>

example/example_zh_CN.ts

@@ -1620,27 +1620,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="84"/>
+        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="85"/>
         <source>close &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="64"/>
-        <location filename="qml/page/T_InfoBar.qml" line="74"/>
-        <location filename="qml/page/T_InfoBar.qml" line="84"/>
+        <location filename="qml/page/T_InfoBar.qml" line="75"/>
+        <location filename="qml/page/T_InfoBar.qml" line="85"/>
         <source>show &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="70"/>
-        <location filename="qml/page/T_InfoBar.qml" line="80"/>
-        <location filename="qml/page/T_InfoBar.qml" line="90"/>
+        <location filename="qml/page/T_InfoBar.qml" line="81"/>
+        <location filename="qml/page/T_InfoBar.qml" line="91"/>
         <source>This is an &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_InfoBar.qml" line="94"/>
+        <location filename="qml/page/T_InfoBar.qml" line="95"/>
         <source>clear all info</source>
         <translation type="unfinished"></translation>
     </message>

example/qml/page/T_InfoBar.qml

@@ -68,6 +68,7 @@ FluScrollablePage{
                             return
                         }
                         info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0)
+                        info1.close()
                     }
                 }
                 FluButton{

example/res/template/src/CMakeLists.txt.in

@@ -72,11 +72,6 @@ install(TARGETS ${PROJECT_NAME}
     BUNDLE DESTINATION .
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_import_qml_plugins(${PROJECT_NAME})
-    qt_finalize_executable(${PROJECT_NAME})
-endif()
-
 if (CMAKE_BUILD_TYPE MATCHES "Release")
     if (APPLE)
         find_program(QT_DEPLOY_QT NAMES macdeployqt)

src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml

@@ -335,7 +335,7 @@ FluButton {
                             if (hours === "12") {
                                 hours24 = (period === control.amText) ? 0 : 12;
                             } else {
-                                hours24 = (period === control.pmText) ? hours24 : hours24 + 12;
+                                hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
                             }
                         }
                         date.setHours(hours24);

src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml

@@ -335,7 +335,7 @@ FluButton {
                             if (hours === "12") {
                                 hours24 = (period === control.amText) ? 0 : 12;
                             } else {
-                                hours24 = (period === control.pmText) ? hours24 : hours24 + 12;
+                                hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
                             }
                         }
                         date.setHours(hours24);