2 files changed, 25 insertions, 3 deletions
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index 3f1515a132..f0ccb97c8a 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qiconhighdpi.pro.
-
 #####################################################################
 ## tst_qiconhighdpi Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qiconhighdpi LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 # Collect test data
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp
index 829c463c6b..34f0132865 100644
--- a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp
+++ b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <qicon.h>
@@ -17,6 +17,7 @@ private slots:
     void addPixmap_data();
     void addPixmap();
     void ninePatch();
+    void preferUpscale();
 };
 
 tst_QIconHighDpi::tst_QIconHighDpi()
@@ -211,6 +212,23 @@ void tst_QIconHighDpi::ninePatch()
     }
 }
 
+void tst_QIconHighDpi::preferUpscale()
+{
+    QIcon icon;
+
+    // manual pixmap adder for full control of devicePixelRatio
+    auto addPixmapWithDpr = [&icon](const QString &path, qreal dpr) {
+        QImage image(path);
+        image.setDevicePixelRatio(dpr);
+        icon.addPixmap(QPixmap::fromImage(image));
+    };
+
+    addPixmapWithDpr(":/icons/testtheme/22x22/actions/appointment-new.png", 1);
+    addPixmapWithDpr(":/icons/testtheme/22x22@2/actions/appointment-new.png", 2);
+
+    QCOMPARE(icon.pixmap(QSize(22, 22), 1.25f).devicePixelRatio(), 1.25f);
+}
+
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);