From b136ea69ce86b6f29e82d2b226e7ca03b942eaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 30 Sep 2024 16:32:06 +0200 Subject: [PATCH] CI: Updated builds to Qt 6.7.3 --- .github/workflows/packages.yml | 6 +++--- src/tiledapp/main.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 6da1ffb99a..a3d4baf99a 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -48,7 +48,7 @@ jobs: include: - qt_version: 5.15.2 qt_version_major: 5 - - qt_version: 6.7.2 + - qt_version: 6.7.3 qt_version_major: 6 env: @@ -194,7 +194,7 @@ jobs: - qt_version: 5.12.12 version_suffix: "10.12-10.15" architectures: x86_64 - - qt_version: 6.7.2 + - qt_version: 6.7.3 version_suffix: "11+" architectures: x86_64,arm64 @@ -286,7 +286,7 @@ jobs: mingw_version: 8.1.0 mingw_component: mingw mingw_path: /c/Qt/Tools/mingw810_32/bin - - qt_version: 6.7.2 + - qt_version: 6.7.3 qt_version_major: 6 qt_toolchain: win64_mingw arch: 64 diff --git a/src/tiledapp/main.cpp b/src/tiledapp/main.cpp index 28a6341e51..fd0cb18e2c 100644 --- a/src/tiledapp/main.cpp +++ b/src/tiledapp/main.cpp @@ -444,7 +444,7 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); #endif -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(6, 7, 3) QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus); #endif