From ac42639ad77430a5e3c02ccd338e339fa0b1a6eb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 30 Jan 2024 11:47:25 +0100 Subject: [PATCH] Windows QPA: Fix unity build Undef a macro that clashes with variables in other sources. Pick-to: 6.6 6.5 Task-number: QTBUG-109394 Change-Id: Id62f886ad64908047fc896f7e48da04759308123 Reviewed-by: Wladimir Leuschner Reviewed-by: Oliver Wolff (cherry picked from commit 9362e4f3fa7c42b9d76fd5b4dd504e749b3bcaab) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/windows/qwindowscontext.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 69e6d8c9808..c363b85cb3b 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -538,6 +538,8 @@ QString QWindowsContext::classNamePrefix() # define xstr(s) str(s) # define str(s) #s str << xstr(QT_NAMESPACE); +# undef str +# undef xstr #endif } return result;