2 files changed, 52 insertions, 2 deletions
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
new file mode 100644
index 0000000000..1a04dfbce0
--- /dev/null
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from qimagewriter.pro.
+
+#####################################################################
+## tst_qimagewriter Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qimagewriter
+    SOURCES
+        tst_qimagewriter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qimagewriter.pro:<TRUE>:
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(qimagewriter_resource_files
+        "images/YCbCr_cmyk.jpg"
+        "images/YCbCr_rgb.jpg"
+        "images/beavis.jpg"
+        "images/colorful.bmp"
+        "images/earth.gif"
+        "images/font.bmp"
+        "images/gnus.xbm"
+        "images/kollada.png"
+        "images/marble.xpm"
+        "images/ship63.pbm"
+        "images/teapot.ppm"
+        "images/trolltech.gif"
+    )
+
+    add_qt_resource(tst_qimagewriter "qimagewriter"
+        PREFIX
+            "/"
+        FILES
+            ${qimagewriter_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index aaa8475c74..247f6443c1 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -94,8 +94,8 @@ private:
 
 static void initializePadding(QImage *image)
 {
-    int effectiveBytesPerLine = (image->width() * image->depth() + 7) / 8;
-    int paddingBytes = image->bytesPerLine() - effectiveBytesPerLine;
+    qsizetype effectiveBytesPerLine = (qsizetype(image->width()) * image->depth() + 7) / 8;
+    qsizetype paddingBytes = image->bytesPerLine() - effectiveBytesPerLine;
     if (paddingBytes == 0)
         return;
     for (int y = 0; y < image->height(); ++y) {