From 1ae65d2cba7e41f7bb43b490f2d0cc150a958163 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 2 Nov 2023 00:04:25 +0400 Subject: [PATCH] Switch Qt 6.4+ back to OpenGL on macOS The flickering bug seem to be fixed with the sRGB hint --- ui/platform/mac/ui_window_mac.mm | 2 -- ui/rp_widget.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm index 9d91f3c..7b29363 100644 --- a/ui/platform/mac/ui_window_mac.mm +++ b/ui/platform/mac/ui_window_mac.mm @@ -273,9 +273,7 @@ void WindowHelper::Private::enforceStyle() { } void WindowHelper::Private::initOpenGL() { -#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0) auto forceOpenGL = std::make_unique(_owner->window()); -#endif // Qt < 6.4.0 } void WindowHelper::Private::resolveWeakPointers() { diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp index a911a66..42d8e95 100644 --- a/ui/rp_widget.cpp +++ b/ui/rp_widget.cpp @@ -29,9 +29,6 @@ public: if (const auto config = q->rhiConfig()) { return *config; } - if (::Platform::IsMac10_14OrGreater()) { - return { QPlatformBackingStoreRhiConfig::Metal }; - } // We can't specify the widget here as q_evaluateRhiConfig is called // in QWidgetWindow constructor, while windowHandle is set right after // the constructor is completed