From 89b6a4cbeedfeece3378b8f1907af6b1e2072061 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 21 Aug 2020 18:09:04 -0700 Subject: DolphinQt: resolve Qt5.15 deprecations --- Source/Core/DolphinQt/Config/ControllersWindow.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/Core/DolphinQt/Config/ControllersWindow.cpp') diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp index 2f3d03ed43..82e6da599b 100644 --- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp @@ -131,9 +131,12 @@ static int GetLayoutHorizontalSpacing(const QGridLayout* layout) // Docs claim this is deprecated, but on macOS with Qt 5.8 this is the only one that actually // works. float pixel_ratio = QGuiApplication::primaryScreen()->devicePixelRatio(); +#ifdef __APPLE__ + // TODO is this still required? hspacing = pixel_ratio * style->pixelMetric(QStyle::PM_DefaultLayoutSpacing); if (hspacing >= 0) return hspacing; +#endif // Ripped from qtbase/src/widgets/styles/qcommonstyle.cpp return pixel_ratio * 6; -- cgit v1.2.3