whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with -no-feature-highdpiscaling 

Fixes: QTBUG-107054
Change-Id: Ie9fd57e8a97c94365ec9e170088af0a82c5e7ba3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
bb10
Tor Arne Vestbø 2022-09-29 15:18:29 +02:00
parent 3be1509013
commit 91e7925dde
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/kernel/qhighdpiscaling.cpp
View File

@ -750,7 +750,20 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w
return scaleAndOrigin(targetScreen, position);
}
#else
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, const QHighDpiScaling::ScreenFactor &factor)
{
const QDebugStateSaver saver(debug);
debug.nospace();
if (!factor.name.isEmpty())
debug << factor.name << "=";
debug << factor.factor;
return debug;
}
#endif
#else // QT_NO_HIGHDPISCALING
QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QPlatformScreen *, QPoint *)
{
return { qreal(1), QPoint() };
@ -765,19 +778,8 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *,
{
return { qreal(1), QPoint() };
}
#endif //QT_NO_HIGHDPISCALING
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, const QHighDpiScaling::ScreenFactor &factor)
{
const QDebugStateSaver saver(debug);
debug.nospace();
if (!factor.name.isEmpty())
debug << factor.name << "=";
debug << factor.factor;
return debug;
}
#endif
#endif // QT_NO_HIGHDPISCALING
QT_END_NAMESPACE