From 638f7f1c953959ebe47534e4a1f9ee2318d786ca Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sun, 19 Jul 2026 22:01:59 -0700 Subject: [PATCH] Switch Qt versions on CI. --- .github/workflows/continuous.yml | 3 ++- leocad.pro | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index afc01870..b968604c 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -15,6 +15,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: + version: '5.15.*' cache: 'true' - name: Get number of CPU cores uses: SimenB/github-actions-cpu-cores@v1 @@ -29,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: cache: 'true' - name: Cache Library diff --git a/leocad.pro b/leocad.pro index 54199862..d3d742f8 100644 --- a/leocad.pro +++ b/leocad.pro @@ -164,19 +164,6 @@ macx { DEFINES += LC_DISABLE_UPDATE_CHECK=1 } -# AGL is not included since 26.0 and Qt5 isn't going to be fixed. -macx { - # QMAKE_MAC_SDK examples: "macosx26.0", "macosx26", "macosx27.1" - SDK_TAG = $$QMAKE_MAC_SDK - SDK_VER_STR = $$replace(SDK_TAG, "macosx", "") - SDK_VER_MAJOR = $$section(SDK_VER_STR, ., 0, 0) - - greaterThan(SDK_VER_MAJOR, 25) { - QMAKE_LIBS_OPENGL -= -framework AGL - LIBS -= -framework AGL - } -} - ios { DEFINES += LC_DISABLE_RENDER_DIALOG=1 DEFINES += LC_DISABLE_BLENDER=1