From b4f9f3219583471842345e4e5eb670ac89bd543a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 6 Jun 2023 20:45:25 +0800 Subject: [PATCH 1/3] update --- .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows-mingw.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- src/FluTheme.cpp | 8 ++------ 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index fe8b802..e47006a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-12] - qt_ver: [6.4.3] + qt_ver: [6.5.0] qt_arch: [clang_64] env: targetName: example @@ -50,7 +50,7 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.4.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.5.0/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel - name: package diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7d94a07..12d82dc 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - qt_ver: [6.4.3] + qt_ver: [6.5.0] qt_arch: [gcc_64] env: targetName: example @@ -55,7 +55,7 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.4.3/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.5.0/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel - name: install QT linux deploy diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index 088691d..37da26a 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -23,7 +23,7 @@ jobs: matrix: include: - qt_arch: win64_mingw - qt_ver: 6.4.3 + qt_ver: 6.5.0 qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900" qt_tools_mingw_install: mingw900_64 env: @@ -62,7 +62,7 @@ jobs: run: | mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.4.3\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel - name: package diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 00f3bd1..40bde6d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [windows-2019] include: - - qt_ver: 6.4.3 + - qt_ver: 6.5.0 qt_arch: win64_msvc2019_64 msvc_arch: x64 qt_arch_install: msvc2019_64 @@ -51,7 +51,7 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }} mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.4.3\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV% diff --git a/src/FluTheme.cpp b/src/FluTheme.cpp index e59ec16..5ba8418 100644 --- a/src/FluTheme.cpp +++ b/src/FluTheme.cpp @@ -3,8 +3,7 @@ #include "Def.h" #include "FluColors.h" #include -#include -#include +#include #include FluTheme* FluTheme::m_instance = nullptr; @@ -45,10 +44,7 @@ bool FluTheme::eventFilter(QObject *obj, QEvent *event) bool FluTheme::systemDark() { - if (const QPlatformTheme * const theme = QGuiApplicationPrivate::platformTheme()) { - return (theme->appearance() == QPlatformTheme::Appearance::Dark); - } - return false; + return QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark; } bool FluTheme::dark(){ From d55874f01e1154663963650de7e339c6cf78e901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 6 Jun 2023 21:02:33 +0800 Subject: [PATCH 2/3] update --- .github/workflows/windows.yml | 2 +- src/FluTheme.cpp | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 40bde6d..985bce3 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' + modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qtspeech' - name: msvc-build id: build diff --git a/src/FluTheme.cpp b/src/FluTheme.cpp index 5ba8418..4372d97 100644 --- a/src/FluTheme.cpp +++ b/src/FluTheme.cpp @@ -2,8 +2,14 @@ #include "Def.h" #include "FluColors.h" -#include +#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #include +#elif ((QT_VERSION >= QT_VERSION_CHECK(6, 2, 1))) +#include +#include +#include +#endif + #include FluTheme* FluTheme::m_instance = nullptr; @@ -44,7 +50,15 @@ bool FluTheme::eventFilter(QObject *obj, QEvent *event) bool FluTheme::systemDark() { - return QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) + return (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark); +#elif ((QT_VERSION >= QT_VERSION_CHECK(6, 2, 1))) + if (const QPlatformTheme * const theme = QGuiApplicationPrivate::platformTheme()) { + return (theme->appearance() == QPlatformTheme::Appearance::Dark); + } + return false; +#endif + return false; } bool FluTheme::dark(){ From ebed19b1307b22dab31e51adb4636b62ca6d9d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 6 Jun 2023 21:14:33 +0800 Subject: [PATCH 3/3] update --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 12d82dc..d8a2840 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -47,7 +47,7 @@ jobs: version: 1.10.2 - name: ubuntu install GL library - run: sudo apt-get install -y libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev libxcb-render-util0-dev libxcb-shm0-dev + run: sudo apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev libxcb-render-util0-dev libxcb-shm0-dev - name: build ubuntu run: |