diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index fb4ca6cfaf0666f95846f2cb4c692ce40c2084a4..48228baf27286fd351be468c4e05c7d8e1341609 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -889,8 +889,8 @@ void FormEditorW::print() const double maxScaling = qMin(page.size().width() / pixmapSize.width(), page.size().height() / pixmapSize.height()); const double scaling = qMin(suggestedScaling, maxScaling); - const double xOffset = page.left() + qMax(qreal(0.0), (page.size().width() - scaling * pixmapSize.width()) / 2.0); - const double yOffset = page.top() + qMax(qreal(0.0), (page.size().height() - scaling * pixmapSize.height()) / 2.0); + const double xOffset = page.left() + qMax(0.0, (page.size().width() - scaling * pixmapSize.width()) / 2.0); + const double yOffset = page.top() + qMax(0.0, (page.size().height() - scaling * pixmapSize.height()) / 2.0); // Draw. painter.translate(xOffset, yOffset); diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp index c341c26ae9375c8a8b14f2cf8ba81487348fd8ef..22bbe4aca5576bb09243f4856cc1e18a49af7f6b 100644 --- a/src/plugins/help/helpviewer_qwv.cpp +++ b/src/plugins/help/helpviewer_qwv.cpp @@ -295,7 +295,7 @@ void HelpViewer::scaleUp() void HelpViewer::scaleDown() { - setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - 0.1)); + setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - qreal(0.1))); } void HelpViewer::resetScale() diff --git a/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp b/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp index d4386ec6fae1a3f23f03e159d5c60efc555137df..8acf7daf40691028e87f95331e8942d7dfe43a65 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp @@ -170,8 +170,8 @@ void AnchorLineController::updatePosition() rightBoundingRect.adjust(0, 7, 5, -7); } else { - double height = qMin(boundingRect.height() / 4., qreal(10.0)); - double width = qMin(boundingRect.width() / 4., qreal(10.0)); + double height = qMin(boundingRect.height() / 4., 10.0); + double width = qMin(boundingRect.width() / 4., 10.0); topBoundingRect.setHeight(height); topBoundingRect.adjust(width, -4, -width, -1); diff --git a/src/plugins/valgrind/callgrindhelper.cpp b/src/plugins/valgrind/callgrindhelper.cpp index 3b362f3d3550fbab0a3f8634b1c83473d3e4e97a..a1b2ae213f49de8b87b7a1dd53dbfb519722594c 100644 --- a/src/plugins/valgrind/callgrindhelper.cpp +++ b/src/plugins/valgrind/callgrindhelper.cpp @@ -58,7 +58,7 @@ QColor CallgrindHelper::colorForString(const QString &text) QColor CallgrindHelper::colorForCostRatio(qreal ratio) { - ratio = qBound(0.0, ratio, 1.0); + ratio = qBound(qreal(0.0), ratio, qreal(1.0)); return QColor::fromHsv(120 - ratio * 120, 255, 255, (-((ratio-1) * (ratio-1))) * 120 + 120); }