3 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 88e955be0d..ff37cb6cd0 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -3236,8 +3236,8 @@ static const QRgba64 *QT_FASTCALL fetchTransformedBilinear64(QRgba64 *buffer, co
                 int y1 = qFloor(py);
                 int y2;
 
-                distxs[i] = qFloor((px - x1) * (1<<16));
-                distys[i] = qFloor((py - y1) * (1<<16));
+                distxs[i] = int((px - x1) * (1<<16));
+                distys[i] = int((py - y1) * (1<<16));
 
                 fetchTransformedBilinear_pixelBounds<blendType>(image.width, image.x1, image.x2 - 1, x1, x2);
                 fetchTransformedBilinear_pixelBounds<blendType>(image.height, image.y1, image.y2 - 1, y1, y2);
diff --git a/src/gui/painting/qpagesize.cpp b/src/gui/painting/qpagesize.cpp
index 8831d60d48..9cbe6ef911 100644
--- a/src/gui/painting/qpagesize.cpp
+++ b/src/gui/painting/qpagesize.cpp
@@ -762,7 +762,7 @@ QPageSizePrivate::QPageSizePrivate(QPageSize::PageSizeId pageSizeId)
       m_windowsId(0),
       m_units(QPageSize::Point)
 {
-    if (pageSizeId >= QPageSize::PageSizeId(0) && pageSizeId <= QPageSize::LastPageSize)
+    if (unsigned(pageSizeId) <= unsigned(QPageSize::LastPageSize))
         init(pageSizeId, QString());
 }
 
@@ -1478,7 +1478,7 @@ QRect QPageSize::rectPixels(int resolution) const
 
 QString QPageSize::key(PageSizeId pageSizeId)
 {
-    if (pageSizeId < PageSizeId(0) || pageSizeId > LastPageSize)
+    if (unsigned(pageSizeId) > unsigned(LastPageSize))
         return QString();
     return QString::fromUtf8(qt_pageSizes[pageSizeId].mediaOption);
 }
@@ -1497,7 +1497,7 @@ static QString msgImperialPageSizeInch(int width, int height)
 
 QString QPageSize::name(PageSizeId pageSizeId)
 {
-    if (pageSizeId < PageSizeId(0) || pageSizeId > LastPageSize)
+    if (unsigned(pageSizeId) > unsigned(LastPageSize))
         return QString();
 
     switch (pageSizeId) {
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 7a53c44bc4..c5e296b293 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -352,8 +352,6 @@ QTransform QTransform::transposed() const
     QTransform t(affine._m11, affine._m21, affine._dx,
                  affine._m12, affine._m22, affine._dy,
                  m_13, m_23, m_33, true);
-    t.m_type = m_type;
-    t.m_dirty = m_dirty;
     return t;
 }