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

Fix compilation with -qreal float

Browse Source 
Task-number: QTBUG-118877
Pick-to: 6.8
Change-Id: Ie5d4f8b500276e0939da6899306fcd6c87b226df
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Tim Blechmann 2024-08-13 13:06:10 +08:00
parent ce176682bc
commit af6f515806
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -1442,8 +1442,8 @@ void QWaylandWindow::handleScreensChanged()
void QWaylandWindow::updateScale() void QWaylandWindow::updateScale()
{ {
if (mFractionalScale) { if (mFractionalScale) {
auto preferredScale = mFractionalScale->preferredScale().value_or(1.0); qreal preferredScale = mFractionalScale->preferredScale().value_or(1.0);
preferredScale = std::max(1.0, preferredScale); preferredScale = std::max<qreal>(1.0, preferredScale);
Q_ASSERT(mViewport); Q_ASSERT(mViewport);
setScale(preferredScale); setScale(preferredScale);
return; return;