1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Fix unity build

Browse Source 
Undef a macro that clashes with variables in other sources.

Task-number: QTBUG-109394
Change-Id: Id62f886ad64908047fc896f7e48da04759308123
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 9362e4f3fa7c42b9d76fd5b4dd504e749b3bcaab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ac42639ad77430a5e3c02ccd338e339fa0b1a6eb)
(cherry picked from commit 443dc7df4be99f55041b9535ce6a2779e88f0052)
This commit is contained in:
Friedemann Kleint 2024-01-30 11:47:25 +01:00 committed by Qt Cherry-pick Bot
parent bea4d640a2
commit 3090f08f1d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/windows/qwindowscontext.cpp
View File

@ -486,6 +486,8 @@ QString QWindowsContext::classNamePrefix()
# define xstr(s) str(s) # define xstr(s) str(s)
# define str(s) #s # define str(s) #s
str << xstr(QT_NAMESPACE); str << xstr(QT_NAMESPACE);
# undef str
# undef xstr
#endif #endif
} }
return result; return result;