From db00428f146a7daf2c8b5c4de6c8c1e317f950a4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 10 12月 2023 23:46:31 +0800
Subject: [PATCH] Fix macro definition mistake

---
 src/core/contexts/win32windowcontext.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index fcbc8f9..4d08adc 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -25,7 +25,9 @@
 #include <timeapi.h>
 #include <versionhelpers.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 Q_DECLARE_METATYPE(QMargins)
+#endif
 
 namespace QWK {
 
@@ -76,7 +78,7 @@
 #undef DYNAMIC_API_DECLARE
 
         DynamicApis() {
-#define DYNAMIC_API_RESOLVE(DLL, NAME) p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL##.resolve(#NAME))
+#define DYNAMIC_API_RESOLVE(DLL, NAME) p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
 
             QSystemLibrary user32(QStringLiteral("user32"));
             DYNAMIC_API_RESOLVE(user32, GetDpiForWindow);

--
Gitblit v1.9.1