From 450d3c18b2b2f9c3653161ac6aadfbc943fbc7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20A=CC=81ngel=20San=20Marti=CC=81n=20Rodri=CC=81guez?= Date: Sat, 10 Sep 2022 11:06:41 +0200 Subject: [PATCH] Fix compile error on macos qt6 due to __OBJC_BOOL_IS_BOOL macro --- YACReaderLibrary/trayhandler.mm | 8 +++++++- common/pdf_comic.mm | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/YACReaderLibrary/trayhandler.mm b/YACReaderLibrary/trayhandler.mm index 9c3cce37..c53f0897 100644 --- a/YACReaderLibrary/trayhandler.mm +++ b/YACReaderLibrary/trayhandler.mm @@ -1,3 +1,9 @@ + +#include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#undef __OBJC_BOOL_IS_BOOL +#endif + #import #include "trayhandler.h" @@ -8,4 +14,4 @@ void OSXShowDockIcon() void OSXHideDockIcon() { [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory]; -} \ No newline at end of file +} diff --git a/common/pdf_comic.mm b/common/pdf_comic.mm index 5cef6e7c..18d3571b 100644 --- a/common/pdf_comic.mm +++ b/common/pdf_comic.mm @@ -1,5 +1,9 @@ #include "pdf_comic.h" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#undef __OBJC_BOOL_IS_BOOL +#endif + #import #import #import