diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp index a0eddf65d91..5c6141ead77 100644 --- a/src/gui/painting/qcosmeticstroker.cpp +++ b/src/gui/painting/qcosmeticstroker.cpp @@ -237,12 +237,12 @@ void QCosmeticStroker::setup() patternLength = 0; for (int i = 0; i < patternSize; ++i) { - patternLength += static_cast(qBound(1., penPattern.at(i) * 64, 65536.)); + patternLength += qBound(1, int(penPattern.at(i) * 64), 65536); pattern[i] = patternLength; } patternLength = 0; for (int i = 0; i < patternSize; ++i) { - patternLength += static_cast(qBound(1., penPattern.at(patternSize - 1 - i) * 64, 65536.)); + patternLength += qBound(1, int(penPattern.at(patternSize - 1 - i) * 64), 65536); reversePattern[i] = patternLength; } strokeSelection |= Dashed; diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 285d2e3f4a9..6028bf02388 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -2734,10 +2734,12 @@ QPdfEnginePrivate::createShadingFunction(const QGradient *gradient, int from, in s << "/C0 [" << stops.at(i).second.redF() << stops.at(i).second.greenF() << stops.at(i).second.blueF() << "]\n" "/C1 [" << stops.at(i + 1).second.redF() << stops.at(i + 1).second.greenF() << stops.at(i + 1).second.blueF() << "]\n"; break; - case QPdfEngine::ColorModel::Grayscale: - s << "/C0 [" << (qGray(stops.at(i).second.rgba()) / 255.) << "]\n" - "/C1 [" << (qGray(stops.at(i + 1).second.rgba()) / 255.) << "]\n"; + case QPdfEngine::ColorModel::Grayscale: { + constexpr qreal normalisationFactor = 1. / 255.; + s << "/C0 [" << (qGray(stops.at(i).second.rgba()) * normalisationFactor) << "]\n" + "/C1 [" << (qGray(stops.at(i + 1).second.rgba()) * normalisationFactor) << "]\n"; break; + } case QPdfEngine::ColorModel::CMYK: s << "/C0 [" << stops.at(i).second.cyanF() << stops.at(i).second.magentaF() diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index d607d38235c..f6c593806e6 100644 --- a/src/gui/text/unix/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp @@ -548,7 +548,7 @@ static void populateFromPattern(FcPattern *pattern, static bool isDprScaling() { - return !qFuzzyCompare(qApp->devicePixelRatio(), 1.0); + return !qFuzzyCompare(qApp->devicePixelRatio(), qreal(1.0)); } QFontconfigDatabase::~QFontconfigDatabase() diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp index 32a066967a5..9af250b7179 100644 --- a/src/testlib/qbenchmarkmeasurement.cpp +++ b/src/testlib/qbenchmarkmeasurement.cpp @@ -51,7 +51,7 @@ void QBenchmarkTickMeasurer::start() QList QBenchmarkTickMeasurer::stop() { CycleCounterTicks now = getticks(); - return { { elapsed(now, startTicks), QTest::CPUTicks } }; + return { { qreal(elapsed(now, startTicks)), QTest::CPUTicks } }; } bool QBenchmarkTickMeasurer::isMeasurementAccepted(QBenchmarkMeasurerBase::Measurement) diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 290d4253742..250015f7d62 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -79,7 +79,7 @@ template struct FixedBufString qint64 ratio; if (v < 1 && Power == 1000) { const char *prefixes = submultiplePrefixes; - ratio = qreal(std::atto::num) / std::atto::den; + ratio = qreal(std::atto::num) / qreal(std::atto::den); while (value * ratio > 1000 && *prefixes) { ++prefixes; ratio *= 1000;