Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 9f1fc31466..846c513f01 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1984,8 +1984,8 @@ int QPdfEnginePrivate::createShadingFunction(const QGradient *gradient, int from
         if (reflect && step % 2) {
             for (int i = stops.size() - 1; i > 0; --i) {
                 QGradientBound b;
-                b.start = step + 1 - qBound(0., stops.at(i).first, 1.);
-                b.stop = step + 1 - qBound(0., stops.at(i - 1).first, 1.);
+                b.start = step + 1 - qBound(qreal(0.), stops.at(i).first, qreal(1.));
+                b.stop = step + 1 - qBound(qreal(0.), stops.at(i - 1).first, qreal(1.));
                 b.function = functions.at(i - 1);
                 b.reverse = true;
                 gradientBounds << b;
@@ -1993,8 +1993,8 @@ int QPdfEnginePrivate::createShadingFunction(const QGradient *gradient, int from
         } else {
             for (int i = 0; i < stops.size() - 1; ++i) {
                 QGradientBound b;
-                b.start = step + qBound(0., stops.at(i).first, 1.);
-                b.stop = step + qBound(0., stops.at(i + 1).first, 1.);
+                b.start = step + qBound(qreal(0.), stops.at(i).first, qreal(1.));
+                b.stop = step + qBound(qreal(0.), stops.at(i + 1).first, qreal(1.));
                 b.function = functions.at(i);
                 b.reverse = false;
                 gradientBounds << b;