diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 220ccca5999..bb50a409f5b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -119,12 +119,6 @@ runs: brew update brew install autoconf autoconf-archive automake bash ccache coreutils llvm@20 nasm ninja pkg-config qt unzip wabt - - name: Install Qt (Windows) - if: ${{ inputs.os == 'Windows' }} - uses: jurplel/install-qt-action@v4 - with: - modules: "qtmultimedia" - - name: 'Set required environment variables' if: ${{ inputs.os == 'Linux' && inputs.arch == 'arm64' }} uses: actions/github-script@v7 diff --git a/vcpkg.json b/vcpkg.json index a11c6256bc7..f4994b62a4f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -123,9 +123,29 @@ "zstd" ] }, + { + "name": "qtbase", + "platform": "windows", + "default-features": false, + "features": [ + "doubleconversion", + "freetype", + "gui", + "icu", + "jpeg", + "network", + "opengl", + "pcre2", + "png", + "thread", + "vulkan", + "widgets", + "zstd" + ] + }, { "name": "qtmultimedia", - "platform": "freebsd" + "platform": "windows | freebsd" }, { "name": "pthread",