diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-01-30 11:47:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-20 16:27:20 +0100 |
| commit | 9362e4f3fa7c42b9d76fd5b4dd504e749b3bcaab (patch) | |
| tree | 16319598153bfaec2b7427591e04426a8d3714df | |
| parent | d478ca528511fcaa95491bcedaa259b2f6c5e727 (diff) | |
Windows QPA: Fix unity build
Undef a macro that clashes with variables in other sources.
Pick-to: 6.7 6.6 6.5
Task-number: QTBUG-109394
Change-Id: Id62f886ad64908047fc896f7e48da04759308123
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/plugins/platforms/windows/qwindowscontext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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; |