From 700d1037aa38f71813826e5104533f357fc41e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 16 Feb 2021 14:59:27 +0100 Subject: Verify that QFileIconProvider returns valid pixmaps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extend and rename the pixmap() crash test to also verify that a non-null pixmap is returned. Change-Id: Ia972c4f705724cfa1394521a2dfd87451d9c5d64 Reviewed-by: Tor Arne Vestbø Reviewed-by: Oliver Wolff --- .../itemviews/qfileiconprovider/tst_qfileiconprovider.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp index 9e9625854e..39f6946b1d 100644 --- a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp +++ b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp @@ -47,7 +47,7 @@ private slots: void type_data(); void type(); - void taskQTBUG_46755_QFileIconEngine_crash(); + void iconPixmaps(); }; void tst_QFileIconProvider::qfileiconprovider() @@ -129,14 +129,14 @@ static QIcon getIcon() return fip.icon(QFileInfo(QDir::currentPath())); } -void tst_QFileIconProvider::taskQTBUG_46755_QFileIconEngine_crash() +void tst_QFileIconProvider::iconPixmaps() { const QIcon &icon = getIcon(); const auto sizes = icon.availableSizes(); - for (const QSize &size : sizes) - icon.pixmap(size); - - // No crash, all good. + for (const QSize &size : sizes) { + QPixmap pixmap = icon.pixmap(size); + QVERIFY(!pixmap.isNull()); + } } QTEST_MAIN(tst_QFileIconProvider) -- cgit v1.2.3