From 2f9090858b85b19e8753b33f15b55e99305dda6d Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Wed, 15 Nov 2023 17:18:24 +0800 Subject: [PATCH 1/4] update --- src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml | 2 +- src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml index 4f7ec5c9..cb902881 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import FluentUI 1.0 -TextInput { +TextEdit { property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 id:control color: textColor diff --git a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml index a0042b42..34c1fc7f 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import FluentUI -TextInput { +TextEdit { property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 id:control color: textColor From 77ae88f518dd865b5af74651ca516b35e0d21587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Wed, 15 Nov 2023 23:54:38 +0800 Subject: [PATCH 2/4] update --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-mingw.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cbffb7b1..ecea36b8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -38,7 +38,7 @@ jobs: version: ${{ matrix.qt_ver }} cache: ${{steps.cache-qt.outputs.cache-hit}} arch: ${{ matrix.qt_arch }} - modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' + modules: 'qt3d qt5compat qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview' - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v3 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 06b6b411..9015746c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,7 +39,7 @@ jobs: version: ${{ matrix.qt_ver }} cache: ${{steps.cache-qt.outputs.cache-hit}} arch: ${{ matrix.qt_arch }} - modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' + modules: 'debug_info qt3d qt5compat qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwaylandcompositor qtwebchannel qtwebengine qtwebsockets qtwebview' - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v3 diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index 4a199735..d1425253 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -47,7 +47,7 @@ jobs: version: ${{ matrix.qt_ver }} arch: ${{ matrix.qt_arch }} cache: ${{steps.cache-qt.outputs.cache-hit}} - modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' + modules: 'debug_info qt3d qt5compat qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebsockets qtwebview' - name: Qt6 environment configuration if: ${{ startsWith( matrix.qt_ver, 6 ) }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 96a1230e..f7f77620 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,7 @@ jobs: version: ${{ matrix.qt_ver }} arch: ${{ matrix.qt_arch }} cache: ${{steps.cache-qt.outputs.cache-hit}} - modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qtspeech qt3d' + modules: 'debug_info qt3d qt5compat qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview' - name: msvc-build id: build From 71c238e62b20ce39296cb41098733b31df8bd9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 16 Nov 2023 00:22:55 +0800 Subject: [PATCH 3/4] update --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-mingw.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ecea36b8..cbffb7b1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -38,7 +38,7 @@ jobs: version: ${{ matrix.qt_ver }} cache: ${{steps.cache-qt.outputs.cache-hit}} arch: ${{ matrix.qt_arch }} - modules: 'qt3d qt5compat qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview' + modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v3 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9015746c..06b6b411 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,7 +39,7 @@ jobs: version: ${{ matrix.qt_ver }} cache: ${{steps.cache-qt.outputs.cache-hit}} arch: ${{ matrix.qt_arch }} - modules: 'debug_info qt3d qt5compat qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwaylandcompositor qtwebchannel qtwebengine qtwebsockets qtwebview' + modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v3 diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index d1425253..4a199735 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -47,7 +47,7 @@ jobs: version: ${{ matrix.qt_ver }} arch: ${{ matrix.qt_arch }} cache: ${{steps.cache-qt.outputs.cache-hit}} - modules: 'debug_info qt3d qt5compat qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebsockets qtwebview' + modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qt3d' - name: Qt6 environment configuration if: ${{ startsWith( matrix.qt_ver, 6 ) }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f7f77620..96a1230e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,7 @@ jobs: version: ${{ matrix.qt_ver }} arch: ${{ matrix.qt_arch }} cache: ${{steps.cache-qt.outputs.cache-hit}} - modules: 'debug_info qt3d qt5compat qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview' + modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qtspeech qt3d' - name: msvc-build id: build From e3e4592ea4beee98afb262eb52b84c7685477821 Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Thu, 16 Nov 2023 10:10:50 +0800 Subject: [PATCH 4/4] update macos action --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cbffb7b1..a314ca85 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -56,7 +56,7 @@ jobs: - name: package run: | # 拷贝依赖 - macdeployqt bin/release/${targetName}.app -qmldir=. -dmg + sudo macdeployqt bin/release/${targetName}.app -qmldir=. -dmg - uses: actions/upload-artifact@v2 with: