diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9de3e870..037297d2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -49,7 +49,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.1' + version: '6.7.3' modules: 'qtwebsockets qtserialport qtmultimedia' aqtversion: '==3.1.20' @@ -84,7 +84,7 @@ jobs: run: | git fetch --tags --force sed -i 's/--long --dirty/--long/g' ./tools/generate_info.sh - sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.8.1\/gcc_64/g' build_deb.sh + sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.7.3\/gcc_64/g' build_deb.sh sed -i 's/LIBSSH2_DIR=\/libssh2/LIBSSH2_DIR=\/usr\/local\/output/g' ./lib/qtssh/qtssh.pri mkdir prebuilt_plugins python3 ./.github/scripts/get_plugin.py ./.github/scripts/plugin_list.json ./prebuilt_plugins diff --git a/.github/workflows/linux_appimage.yml b/.github/workflows/linux_appimage.yml index 935987e9..7c29dce1 100644 --- a/.github/workflows/linux_appimage.yml +++ b/.github/workflows/linux_appimage.yml @@ -49,7 +49,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.1' + version: '6.7.3' modules: 'qtwebsockets qtserialport qtmultimedia' aqtversion: '==3.1.20' @@ -84,7 +84,7 @@ jobs: run: | git fetch --tags --force sed -i 's/--long --dirty/--long/g' ./tools/generate_info.sh - sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.8.1\/gcc_64/g' build_AppImage.sh + sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.7.3\/gcc_64/g' build_AppImage.sh sed -i 's/LIBSSH2_DIR=\/libssh2/LIBSSH2_DIR=\/usr\/local\/output/g' ./lib/qtssh/qtssh.pri mkdir prebuilt_plugins python3 ./.github/scripts/get_plugin.py ./.github/scripts/plugin_list.json ./prebuilt_plugins diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d97802f5..780eb658 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -50,7 +50,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: arch: win64_mingw - version: '6.8.1' + version: '6.7.3' modules: 'qtwebsockets qtserialport qtmultimedia' aqtversion: '==3.1.19' tools: 'tools_mingw1310' diff --git a/.github/workflows/windows_msvc.yml b/.github/workflows/windows_msvc.yml index 4d59c245..96fce6b7 100644 --- a/.github/workflows/windows_msvc.yml +++ b/.github/workflows/windows_msvc.yml @@ -50,7 +50,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: arch: 'win64_msvc2022_64' - version: '6.8.1' + version: '6.7.3' modules: 'qtwebsockets qtserialport qtmultimedia' aqtversion: '==3.1.19' diff --git a/depend/build_fcitx_qt6_linux.sh b/depend/build_fcitx_qt6_linux.sh index b1e4670f..de33c5ae 100755 --- a/depend/build_fcitx_qt6_linux.sh +++ b/depend/build_fcitx_qt6_linux.sh @@ -3,9 +3,9 @@ set -e # ubuntu20.04 need install # sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules -# export PATH="~/Qt/6.8.1/gcc_64/bin":$PATH +# export PATH="~/Qt/6.7.3/gcc_64/bin":$PATH # export PATH="~/Qt/Tools/CMake/bin":$PATH -# export Qt6GuiTools_DIR=/home/qqm/Qt/6.8.1/gcc_64 +# export Qt6GuiTools_DIR=/home/qqm/Qt/6.7.3/gcc_64 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) tar -xzvf fcitx-qt5-1.2.7.tar.gz cd $SHELL_FOLDER/fcitx-qt5-1.2.7