7 files changed, 40 insertions, 76 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index 704c51a6be..17ec68df4e 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -1,9 +1,16 @@
-# Generated from qicoimageformat.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qicoimageformat Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qicoimageformat LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 # Collect test data
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -13,37 +20,8 @@ list(APPEND test_data ${test_data_glob})
 qt_internal_add_test(tst_qicoimageformat
     SOURCES
         tst_qicoimageformat.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
     TESTDATA ${test_data}
 )
 
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(qicoimageformat_resource_files
-        "icons/invalid/35floppy.ico"
-        "icons/valid/35FLOPPY.ICO"
-        "icons/valid/AddPerfMon.ico"
-        "icons/valid/App.ico"
-        "icons/valid/Obj_N2_Internal_Mem.ico"
-        "icons/valid/Qt.ico"
-        "icons/valid/Status_Play.ico"
-        "icons/valid/TIMER01.ICO"
-        "icons/valid/WORLD.ico"
-        "icons/valid/WORLDH.ico"
-        "icons/valid/abcardWindow.ico"
-        "icons/valid/semitransparent.ico"
-        "icons/valid/trolltechlogo_tiny.ico"
-        "icons/valid/yellow.cur"
-    )
-
-    qt_internal_add_resource(tst_qicoimageformat "qicoimageformat"
-        PREFIX
-            "/"
-        FILES
-            ${qicoimageformat_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.ico b/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.ico
new file mode 100644
index 0000000000..7e9cfa2414
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.ico
diff --git a/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.png b/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.png
new file mode 100644
index 0000000000..f0a19c05e3
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/icons/masked/24bpp.png
diff --git a/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.ico b/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.ico
new file mode 100644
index 0000000000..a22248d76a
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.ico
diff --git a/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.png b/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.png
new file mode 100644
index 0000000000..a6ceac73fa
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/icons/masked/32bpp.png
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc b/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc
deleted file mode 100644
index 1e0ee8aa8c..0000000000
--- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc
+++ /dev/null
@@ -1,18 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>icons/invalid/35floppy.ico</file>
-    <file>icons/valid/35FLOPPY.ICO</file>
-    <file>icons/valid/abcardWindow.ico</file>
-    <file>icons/valid/AddPerfMon.ico</file>
-    <file>icons/valid/App.ico</file>
-    <file>icons/valid/Obj_N2_Internal_Mem.ico</file>
-    <file>icons/valid/Qt.ico</file>
-    <file>icons/valid/semitransparent.ico</file>
-    <file>icons/valid/Status_Play.ico</file>
-    <file>icons/valid/TIMER01.ICO</file>
-    <file>icons/valid/trolltechlogo_tiny.ico</file>
-    <file>icons/valid/WORLD.ico</file>
-    <file>icons/valid/WORLDH.ico</file>
-    <file>icons/valid/yellow.cur</file>
-  </qresource>
-</RCC>
diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
index 37d5f4998c..136f56facf 100644
--- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 #include <QTest>
 #include <QtGui>
 #include <QtCore>
@@ -52,6 +27,8 @@ private slots:
     void pngCompression();
     void write_data();
     void write();
+    void icoMask_data();
+    void icoMask();
 
 private:
     QString m_IconPath;
@@ -344,6 +321,33 @@ void tst_QIcoImageFormat::write()
     }
 }
 
+void tst_QIcoImageFormat::icoMask_data()
+{
+    QTest::addColumn<QString>("inFile");
+    QTest::addColumn<QString>("outFile");
+
+    QTest::newRow("24bpp") << "masked/24bpp.ico" << "masked/24bpp.png";
+    QTest::newRow("32bpp") << "masked/32bpp.ico" << "masked/32bpp.png";
+}
+
+void tst_QIcoImageFormat::icoMask()
+{
+    QFETCH(QString, inFile);
+    QFETCH(QString, outFile);
+
+    QImage inImage;
+    QImageReader inReader(m_IconPath + QLatin1Char('/') + inFile);
+    inReader.read(&inImage);
+
+    QImage outImage;
+    QImageReader outReader(m_IconPath + QLatin1Char('/') + outFile);
+    outReader.read(&outImage);
+    outImage.setColorSpace(inImage.colorSpace());
+    outImage = outImage.convertToFormat(inImage.format());
+
+    QCOMPARE(inImage, outImage);
+}
+
 QTEST_MAIN(tst_QIcoImageFormat)
 #include "tst_qicoimageformat.moc"