From d522300857fd6d321e657381799804960f7f1678 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: 周日, 17 12月 2023 18:55:03 +0800 Subject: [PATCH] remove unused workarounds --- src/core/windowagentbase.cpp | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp index 65b7dad..f38fb5d 100644 --- a/src/core/windowagentbase.cpp +++ b/src/core/windowagentbase.cpp @@ -1,10 +1,14 @@ #include "windowagentbase.h" #include "windowagentbase_p.h" +#include <QWKCore/qwkconfig.h> + #include "qwkglobal_p.h" -#ifdef Q_OS_WINDOWS +#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT) # include "win32windowcontext_p.h" +#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT) +# include "cocoawindowcontext_p.h" #else # include "qtwindowcontext_p.h" #endif @@ -28,8 +32,11 @@ if (windowContextFactoryMethod) { return windowContextFactoryMethod(); } -#ifdef Q_OS_WINDOWS + +#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT) return new Win32WindowContext(); +#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT) + return new CocoaWindowContext(); #else return new QtWindowContext(); #endif -- Gitblit v1.9.1