From 9e208bb77c72d215d9be0216dc4e86bb6b12a3d3 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao Date: Thu, 30 Mar 2023 11:47:34 +0800 Subject: [PATCH] fix build on qt5 Task-number: #210 Signed-off-by: Yuhang Zhao --- src/core/utils.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/utils.cpp b/src/core/utils.cpp index e1bd2d3..a2c1b2e 100644 --- a/src/core/utils.cpp +++ b/src/core/utils.cpp @@ -480,11 +480,11 @@ QPoint Utils::toNativeGlobalPosition(const QWindow *window, const QPoint &point) if (!window) { return {}; } -#ifdef FRAMELESSHELPER_CORE_NO_PRIVATE +#if (defined(FRAMELESSHELPER_CORE_NO_PRIVATE) || (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))) return toNativePixels(window, point); -#else // !FRAMELESSHELPER_CORE_NO_PRIVATE +#else // !FRAMELESSHELPER_CORE_NO_PRIVATE && QT_VERSION >= 6.0.0 return QHighDpi::toNativeGlobalPosition(point, window); -#endif // FRAMELESSHELPER_CORE_NO_PRIVATE +#endif // FRAMELESSHELPER_CORE_NO_PRIVATE || QT_VERSION < 6.0.0 } QPoint Utils::fromNativeLocalPosition(const QWindow *window, const QPoint &point) @@ -506,11 +506,11 @@ QPoint Utils::fromNativeGlobalPosition(const QWindow *window, const QPoint &poin if (!window) { return {}; } -#ifdef FRAMELESSHELPER_CORE_NO_PRIVATE +#if (defined(FRAMELESSHELPER_CORE_NO_PRIVATE) || (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))) return fromNativePixels(window, point); -#else // !FRAMELESSHELPER_CORE_NO_PRIVATE +#else // !FRAMELESSHELPER_CORE_NO_PRIVATE && QT_VERSION >= 6.0.0 return QHighDpi::fromNativeGlobalPosition(point, window); -#endif // FRAMELESSHELPER_CORE_NO_PRIVATE +#endif // FRAMELESSHELPER_CORE_NO_PRIVATE || QT_VERSION < 6.0.0 } int Utils::horizontalAdvance(const QFontMetrics &fm, const QString &str)