From eab455422f5492286840ee71a436ae5765d51c10 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 29 Mar 2022 11:12:54 +0800 Subject: [PATCH 1/2] Add missing header Fix up 75c93d72be7a31f29d6c14aa6f3eefa8ec9f9ea1. --- src/gui/properties/downloadedpiecesbar.cpp | 2 ++ src/gui/properties/pieceavailabilitybar.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gui/properties/downloadedpiecesbar.cpp b/src/gui/properties/downloadedpiecesbar.cpp index 31535889d..b4310b3f2 100644 --- a/src/gui/properties/downloadedpiecesbar.cpp +++ b/src/gui/properties/downloadedpiecesbar.cpp @@ -34,6 +34,8 @@ #include #include +#include "base/global.h" + namespace { QColor dlPieceColor(const QColor &pieceColor) diff --git a/src/gui/properties/pieceavailabilitybar.cpp b/src/gui/properties/pieceavailabilitybar.cpp index e0944b127..a20d7505a 100644 --- a/src/gui/properties/pieceavailabilitybar.cpp +++ b/src/gui/properties/pieceavailabilitybar.cpp @@ -33,6 +33,8 @@ #include +#include "base/global.h" + PieceAvailabilityBar::PieceAvailabilityBar(QWidget *parent) : base {parent} { From 3951b891c130a9bd541752f2ca47e46781296b03 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 29 Mar 2022 11:08:50 +0800 Subject: [PATCH 2/2] GHA CI: work around error when installing Qt This is to (temporarily) work around CI errors at jurplel/install-qt-action. Upstream issue: https://github.com/jurplel/install-qt-action/issues/130 --- .github/workflows/ci_macos.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index 82b2afad0..ae67754ac 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -53,6 +53,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: + setup-python: false version: ${{ matrix.qt_version }} - name: Install libtorrent