diff options
Diffstat (limited to 'tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp')
-rw-r--r-- | tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp index 9e9625854e..3cba6dbf8b 100644 --- a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp +++ b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.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 <QFileIconProvider> @@ -47,7 +22,7 @@ private slots: void type_data(); void type(); - void taskQTBUG_46755_QFileIconEngine_crash(); + void iconPixmaps(); }; void tst_QFileIconProvider::qfileiconprovider() @@ -73,6 +48,7 @@ void tst_QFileIconProvider::iconType_data() // public QIcon icon(QFileIconProvider::IconType const& type) const void tst_QFileIconProvider::iconType() { + QGuiApplication::setDesktopSettingsAware(false); QFETCH(QFileIconProvider::IconType, type); QFileIconProvider provider; QVERIFY(!provider.icon(type).isNull()); @@ -129,14 +105,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) |