From 4dc8c0acc6d901553ae71818a09c74442aa46e49 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Sun, 21 Apr 2024 23:25:54 +0800 Subject: [PATCH] Qt: Bump to 6.6.3. Due to Qt 6.5.3's bug, it's better to use the latest Qt release(Qt 6.6.3). --- .github/workflows/macos-shared.yml | 6 +++--- .github/workflows/macos-static.yml | 6 +++--- .github/workflows/ubuntu-shared.yml | 4 ++-- .github/workflows/ubuntu-static.yml | 4 ++-- .github/workflows/windows-mingw-shared.yml | 4 ++-- .github/workflows/windows-mingw-static.yml | 4 ++-- .github/workflows/windows-msvc-shared.yml | 4 ++-- .github/workflows/windows-msvc-static.yml | 4 ++-- CMakeLists.txt | 3 ++- README(zh-cn).md | 6 +++--- README.md | 6 +++--- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.github/workflows/macos-shared.yml b/.github/workflows/macos-shared.yml index 83deea4..c952b40 100644 --- a/.github/workflows/macos-shared.yml +++ b/.github/workflows/macos-shared.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-14] - qt_ver: [6.5.3] + qt_ver: [6.6.3] qt_arch: [clang_64] env: targetName: RibbonUI-APP @@ -49,13 +49,13 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.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/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel - name: package run: | # 先删除所有dSYM文件，减少包的体积 - sudo find /Users/runner/work/RibbonUI/Qt/6.5.3/macos/qml -name "*.dSYM" | xargs rm -r + sudo find /Users/runner/work/RibbonUI/Qt/6.6.3/macos/qml -name "*.dSYM" | xargs rm -r # 拷贝依赖 sudo macdeployqt /Users/runner/work/RibbonUI/RibbonUI/build/app/release/${targetName}.app -qmldir=. -verbose=1 -dmg diff --git a/.github/workflows/macos-static.yml b/.github/workflows/macos-static.yml index ee91700..7655682 100644 --- a/.github/workflows/macos-static.yml +++ b/.github/workflows/macos-static.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-14] - qt_ver: [6.5.3] + qt_ver: [6.6.3] qt_arch: [clang_64] env: targetName: RibbonUI-APP @@ -49,13 +49,13 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. cmake --build . --target all --config Release --parallel - name: package run: | # 先删除所有dSYM文件，减少包的体积 - sudo find /Users/runner/work/RibbonUI/Qt/6.5.3/macos/qml -name "*.dSYM" | xargs rm -r + sudo find /Users/runner/work/RibbonUI/Qt/6.6.3/macos/qml -name "*.dSYM" | xargs rm -r # 拷贝依赖 sudo macdeployqt /Users/runner/work/RibbonUI/RibbonUI/build/app/release/${targetName}.app -qmldir=. -verbose=1 -dmg diff --git a/.github/workflows/ubuntu-shared.yml b/.github/workflows/ubuntu-shared.yml index 3bd3d4e..d09250e 100644 --- a/.github/workflows/ubuntu-shared.yml +++ b/.github/workflows/ubuntu-shared.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - qt_ver: [6.5.3] + qt_ver: [6.6.3] qt_arch: [gcc_64] env: targetName: RibbonUI-APP @@ -57,7 +57,7 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/RibbonUI/Qt/6.5.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/RibbonUI/Qt/6.6.3/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/ubuntu-static.yml b/.github/workflows/ubuntu-static.yml index 1f27311..443e030 100644 --- a/.github/workflows/ubuntu-static.yml +++ b/.github/workflows/ubuntu-static.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - qt_ver: [6.5.3] + qt_ver: [6.6.3] qt_arch: [gcc_64] env: targetName: RibbonUI-APP @@ -57,7 +57,7 @@ jobs: cmake --version mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/RibbonUI/Qt/6.5.3/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/RibbonUI/Qt/6.6.3/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. cmake --build . --target all --config Release --parallel - name: install QT linux deploy diff --git a/.github/workflows/windows-mingw-shared.yml b/.github/workflows/windows-mingw-shared.yml index 5b3f936..2548941 100644 --- a/.github/workflows/windows-mingw-shared.yml +++ b/.github/workflows/windows-mingw-shared.yml @@ -23,7 +23,7 @@ jobs: matrix: include: - qt_arch: win64_mingw - qt_ver: 6.5.3 + qt_ver: 6.6.3 qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900" qt_tools_mingw_install: mingw900_64 env: @@ -66,7 +66,7 @@ jobs: run: | mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.5.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\RibbonUI\Qt\6.6.3\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-mingw-static.yml b/.github/workflows/windows-mingw-static.yml index b4f2565..8cae8f4 100644 --- a/.github/workflows/windows-mingw-static.yml +++ b/.github/workflows/windows-mingw-static.yml @@ -23,7 +23,7 @@ jobs: matrix: include: - qt_arch: win64_mingw - qt_ver: 6.5.3 + qt_ver: 6.6.3 qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900" qt_tools_mingw_install: mingw900_64 env: @@ -66,7 +66,7 @@ jobs: run: | mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.5.3\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.6.3\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. cmake --build . --target all --config Release --parallel - name: package diff --git a/.github/workflows/windows-msvc-shared.yml b/.github/workflows/windows-msvc-shared.yml index 122b22a..07e8b43 100644 --- a/.github/workflows/windows-msvc-shared.yml +++ b/.github/workflows/windows-msvc-shared.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [windows-latest] include: - - qt_ver: 6.5.3 + - qt_ver: 6.6.3 qt_arch: win64_msvc2019_64 msvc_arch: x64 qt_arch_install: msvc2019_64 @@ -55,7 +55,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }} mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.5.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\RibbonUI\Qt\6.6.3\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/.github/workflows/windows-msvc-static.yml b/.github/workflows/windows-msvc-static.yml index d9f7a39..d5fc206 100644 --- a/.github/workflows/windows-msvc-static.yml +++ b/.github/workflows/windows-msvc-static.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [windows-latest] include: - - qt_ver: 6.5.3 + - qt_ver: 6.6.3 qt_arch: win64_msvc2019_64 msvc_arch: x64 qt_arch_install: msvc2019_64 @@ -55,7 +55,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }} mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.5.3\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\RibbonUI\Qt\6.6.3\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_STATIC_LIB=ON -GNinja .. cmake --build . --target all --config Release --parallel echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV% diff --git a/CMakeLists.txt b/CMakeLists.txt index a5f457d..33e4cf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,11 +14,12 @@ if(NOT RIBBONUI_QML_PLUGIN_DIRECTORY) set(RIBBONUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/RibbonUI CACHE PATH "RibbonUI Plugin Path") endif() +add_subdirectory(lib_source) + if (RIBBONUI_BUILD_EXAMPLES) add_subdirectory(example) endif() -add_subdirectory(lib_source) message("---------------------------- RibbonUI ----------------------------") message("Build RibbonUI APP: ${RIBBONUI_BUILD_EXAMPLES}") message("Build RibbonUI static library: ${RIBBONUI_BUILD_STATIC_LIB}") diff --git a/README(zh-cn).md b/README(zh-cn).md index 7154aa9..f38dbfd 100644 --- a/README(zh-cn).md +++ b/README(zh-cn).md @@ -81,7 +81,7 @@ RibbonUI是一个参考微软Ribbon风格（即Office 2016后的风格）设计 ## 4. 如何使用? + 安装前准备 - 安装Qt 6，推荐通过官方在线安装器安装**Qt 6.5.3 LTS版本**，**通过brew等方式安装可能会出现问题**。**Qt Quick相关模块**和**qt5compat qtshadertools qtimageformats**组件是必要的。 + 安装Qt 6，推荐通过官方在线安装器安装**Qt 6.6.3版本**，**通过brew等方式安装可能会出现问题**。**Qt Quick相关模块**和**qt5compat qtshadertools qtimageformats**组件是必要的。 + 编译例程和库 - 下载仓库并进入 @@ -98,7 +98,7 @@ RibbonUI是一个参考微软Ribbon风格（即Office 2016后的风格）设计 ```shell # 如果想进行Debug编译, 请配置 -DCMAKE_BUILD_TYPE=Debug和--config Debug参数 # 如果想编译静态库, 请在cmake参数中加入-DRIBBONUI_BUILD_STATIC_LIB=ON - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.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/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. # -DCMAKE_PREFIX_PATH={你的Qt安装目录} cmake --build . --target all --config Release --parallel ``` @@ -112,7 +112,7 @@ RibbonUI是一个参考微软Ribbon风格（即Office 2016后的风格）设计 ```shell # 如果想进行Debug编译, 请配置 -DCMAKE_BUILD_TYPE=Debug和--config Debug参数 # 如果想编译静态库, 请在cmake参数中加入-DRIBBONUI_BUILD_STATIC_LIB=ON - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_EXAMPLES=OFF -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_EXAMPLES=OFF -GNinja .. # -DCMAKE_PREFIX_PATH={你的Qt安装目录} cmake --build . --target all --config Release --parallel ``` diff --git a/README.md b/README.md index d53a907..e271640 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ The current design is based on Qt 6, and support for Qt 5 will be added sometime ## 4. How to use it? + Before Install - To install Qt 6, it is recommended to install the **Qt 6.5.3** LTS version via the official online installer, **installing via brew, etc. may cause problems**. **Qt Quick related modules** and the **qt5compat qtshadertools qtimageformats** component are required + To install Qt 6, it is recommended to install the **Qt 6.6.3** version via the official online installer, **installing via brew, etc. may cause problems**. **Qt Quick related modules** and the **qt5compat qtshadertools qtimageformats** component are required + Compile the example and library - Clone and enter the library folder @@ -96,7 +96,7 @@ The current design is based on Qt 6, and support for Qt 5 will be added sometime ```shell # if you want to make a Debug build, just let -DCMAKE_BUILD_TYPE=Debug, --config Debug # if you want a static build, add -DRIBBONUI_BUILD_STATIC_LIB=ON into command - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.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/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. # -DCMAKE_PREFIX_PATH={YOUR QT INSTALL FOLDER} cmake --build . --target all --config Release --parallel ``` @@ -110,7 +110,7 @@ The current design is based on Qt 6, and support for Qt 5 will be added sometime ```shell # if you want to make a Debug build, just let -DCMAKE_BUILD_TYPE=Debug, --config Debug # if you want a static build, add -DRIBBONUI_BUILD_STATIC_LIB=ON into command - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.5.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_EXAMPLES=OFF -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/RibbonUI/Qt/6.6.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DRIBBONUI_BUILD_EXAMPLES=OFF -GNinja .. # -DCMAKE_PREFIX_PATH={YOUR QT INSTALL FOLDER} cmake --build . --target all --config Release --parallel ```