From c53c292c1b2ecdc57979d31f7c07e0b12f7b4be0 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Wed, 25 Jan 2023 08:37:21 +0800 Subject: [PATCH] Windows QPA: fix debug message Before applying this patch, the debug message will contain new lines which will look rather weired, this patch fixes that. Amends commit 5e0d9a077d28802988182319ae257e9102f0344e Change-Id: I2420c04dd7e18a6556664a05ac4ef35c9b652f0c Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowscontext.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 718cfe11d82..7fe5b2592cb 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -410,27 +410,28 @@ QtWindows::DpiAwareness QWindowsContext::processDpiAwareness() QDebug operator<<(QDebug d, QtWindows::DpiAwareness dpiAwareness) { const QDebugStateSaver saver(d); - d.nospace().noquote() << "QtWindows::DpiAwareness::"; + QString message = u"QtWindows::DpiAwareness::"_s; switch (dpiAwareness) { case QtWindows::DpiAwareness::Invalid: - d.nospace().noquote() << "Invalid"; + message += u"Invalid"_s; break; case QtWindows::DpiAwareness::Unaware: - d.nospace().noquote() << "Unaware"; + message += u"Unaware"_s; break; case QtWindows::DpiAwareness::System: - d.nospace().noquote() << "System"; + message += u"System"_s; break; case QtWindows::DpiAwareness::PerMonitor: - d.nospace().noquote() << "PerMonitor"; + message += u"PerMonitor"_s; break; case QtWindows::DpiAwareness::PerMonitorVersion2: - d.nospace().noquote() << "PerMonitorVersion2"; + message += u"PerMonitorVersion2"_s; break; case QtWindows::DpiAwareness::Unaware_GdiScaled: - d.nospace().noquote() << "Unaware_GdiScaled"; + message += u"Unaware_GdiScaled"_s; break; } + d.nospace().noquote() << message; return d; } #endif