diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9d1f73f8..c33e9270 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: shell: bash run: | sudo apt-get update -qq; - sudo apt install -qq libx11-dev qt6-qtsvg-dev + sudo apt install -qq libx11-dev libx11-xcb-dev - name: Create build environment run: cmake -E make_directory ${{ runner.workspace }}/build - name: Configure CMake diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec5de576..1da8dfef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,14 +9,14 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - qt_version: [6.0.4, 6.8.0] + qt_version: [6.2.4, 6.8.0] include: - os: windows-latest - qt_compile_suite: msvc2022_64 + qt_compile_suite: win64_msvc2022_64 exclude: # We only want to test for the latest version of Qt on Windows - os: windows-latest - qt_version: 6.8.0 + qt_version: 6.2.4 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -32,7 +32,7 @@ jobs: run: | if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get update -qq; - sudo apt install -qq libx11-dev libqt5svg5-dev libx11-xcb-dev desktop-file-utils + sudo apt install -qq libx11-dev libx11-xcb-dev desktop-file-utils elif [ "$RUNNER_OS" == "Windows" ]; then choco install -y --force openssl.light --version=1.1.1 echo "C:\\Program Files\\OpenSSL" >> $GITHUB_PATH diff --git a/CMakeLists.txt b/CMakeLists.txt index c778f683..49470d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ if(WIN32) set(PLATFORM_EXE_SOURCES src/res/birdtray.rc) set(PLATFORM_HEADERS src/windowtools_win.h src/birdtrayeventfilter.h src/processhandle.h) else() + find_library(X11 X11) list(APPEND REQUIRED_MODULES X11) set(PLATFORM_SOURCES src/windowtools_x11.cpp) set(PLATFORM_HEADERS src/windowtools_x11.h)