1 files changed, 9 insertions, 29 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.h b/tests/manual/dialogs/filedialogpanel.h
index 28dded3891..3acf193121 100644
--- a/tests/manual/dialogs/filedialogpanel.h
+++ b/tests/manual/dialogs/filedialogpanel.h
@@ -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
 
 #ifndef FILEDIALOGPANEL_H
 #define FILEDIALOGPANEL_H
@@ -34,6 +9,8 @@
 #include <QPointer>
 
 QT_BEGIN_NAMESPACE
+
+class QAbstractFileIconProvider;
 class QPushButton;
 class QCheckBox;
 class QComboBox;
@@ -51,7 +28,7 @@ public:
 
 public slots:
     void execModal();
-    void showModal();
+    void showModal(Qt::WindowModality modality);
     void showNonModal();
     void deleteNonModalDialog();
     void deleteModalDialog();
@@ -77,7 +54,7 @@ private:
     QString filterString() const;
     QFileDialog::Options options() const;
     QStringList allowedSchemes() const;
-    void applySettings(QFileDialog *d) const;
+    void applySettings(QFileDialog *d);
 
     QFormLayout *filesLayout;
     QCheckBox *m_showDirsOnly;
@@ -87,6 +64,9 @@ private:
     QCheckBox *m_resolveSymLinks;
     QCheckBox *m_native;
     QCheckBox *m_customDirIcons;
+    QCheckBox *m_noIconProvider = nullptr;
+    QAbstractFileIconProvider *m_origIconProvider = nullptr;
+
     QComboBox *m_acceptMode;
     QComboBox *m_fileMode;
     QComboBox *m_viewMode;