Move QAbstractFileIconEngine into QtGui

Task-number: QTBUG-83255
Change-Id: Iab502c51600b96f315113b08fa473ed28a5457fc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 7 insertions, 236 deletions

diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index 6132d305f4..f6857a077f 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -4,8 +4,10 @@ add_subdirectory(edid)
 add_subdirectory(eventdispatchers)
 add_subdirectory(devicediscovery)
 add_subdirectory(fbconvenience)
-add_subdirectory(themes)
 # special case begin
+if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE))
+    add_subdirectory(themes)
+endif()
 if (QT_FEATURE_dbus)
     add_subdirectory(linuxofono)
 endif()
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 439685bfd8..082880654b 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -5,8 +5,10 @@ SUBDIRS = \
     edid \
     eventdispatchers \
     devicediscovery \
-    fbconvenience \
-    themes
+    fbconvenience
+
+if(unix:!uikit:!macos)|qtConfig(xcb): \
+    SUBDIRS += themes
 
 if(qtConfig(freetype):!darwin)|win32: \
     SUBDIRS += fontdatabases
diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt
index 3b1ad022b8..87b40732da 100644
--- a/src/platformsupport/themes/CMakeLists.txt
+++ b/src/platformsupport/themes/CMakeLists.txt
@@ -7,8 +7,6 @@
 qt_add_module(ThemeSupport
     STATIC
     INTERNAL_MODULE
-    SOURCES
-        qabstractfileiconengine.cpp qabstractfileiconengine_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
     PUBLIC_LIBRARIES
diff --git a/src/platformsupport/themes/qabstractfileiconengine.cpp b/src/platformsupport/themes/qabstractfileiconengine.cpp
deleted file mode 100644
index c5800d9119..0000000000
--- a/src/platformsupport/themes/qabstractfileiconengine.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qabstractfileiconengine_p.h"
-
-#include <qpixmapcache.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QAbstractFileIconEngine
-    \brief Helper base class for retrieving icons for files for usage by QFileIconProvider and related.
-
-    Reimplement availableSizes() and new virtual filePixmap() and return icons created
-    with this engine from QPlatformTheme::fileIcon().
-
-    Note: The class internally caches pixmaps for files by suffix (with the exception
-    of some files on Windows), but not for directories (since directory icons may have
-    overlay icons on Windows). You might want to cache pixmaps for directories
-    in your implementation.
-
-    \since 5.8
-    \internal
-    \sa QFileIconProvider::DontUseCustomDirectoryIcons, QPlatformTheme
-    \ingroup qpa
-*/
-QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
-                                        QIcon::State state)
-{
-    Q_UNUSED(mode);
-    Q_UNUSED(state);
-
-    if (!size.isValid())
-        return QPixmap();
-
-    QString key = cacheKey();
-    if (key.isEmpty())
-        return filePixmap(size, mode, state);
-
-    key += QLatin1Char('_') + QString::number(size.width());
-
-    QPixmap result;
-    if (!QPixmapCache::find(key, &result)) {
-        result = filePixmap(size, mode, state);
-        if (!result.isNull())
-            QPixmapCache::insert(key, result);
-    }
-
-    return result;
-}
-
-QSize QAbstractFileIconEngine::actualSize(const QSize &size, QIcon::Mode mode,
-                                          QIcon::State state)
-{
-    const QList<QSize> &sizes = availableSizes(mode, state);
-    const int numberSizes = sizes.length();
-    if (numberSizes == 0)
-        return QSize();
-
-    // Find the smallest available size whose area is still larger than the input
-    // size. Otherwise, use the largest area available size. (We don't assume the
-    // platform theme sizes are sorted, hence the extra logic.)
-    const int sizeArea = size.width() * size.height();
-    QSize actualSize = sizes.first();
-    int actualArea = actualSize.width() * actualSize.height();
-    for (int i = 1; i < numberSizes; ++i) {
-        const QSize &s = sizes.at(i);
-        const int a = s.width() * s.height();
-        if ((sizeArea <= a && a < actualArea) || (actualArea < sizeArea && actualArea < a)) {
-            actualSize = s;
-            actualArea = a;
-        }
-    }
-
-    if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
-        actualSize.scale(size, Qt::KeepAspectRatio);
-
-    return actualSize;
-}
-
-/* Reimplement to return a cache key for the entry. An empty result indicates
- * the icon should not be cached (for example, directory icons having custom icons). */
-QString QAbstractFileIconEngine::cacheKey() const
-{
-    if (!m_fileInfo.isFile() || m_fileInfo.isSymLink() || m_fileInfo.isExecutable())
-        return QString();
-
-    const QString &suffix = m_fileInfo.suffix();
-    return QLatin1String("qt_.")
-        + (suffix.isEmpty() ? m_fileInfo.fileName() : suffix); // handle "Makefile"                                    ;)
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/themes/qabstractfileiconengine_p.h b/src/platformsupport/themes/qabstractfileiconengine_p.h
deleted file mode 100644
index ce38cf262e..0000000000
--- a/src/platformsupport/themes/qabstractfileiconengine_p.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QABSTRACTFILEICONENGINE_P_H
-#define QABSTRACTFILEICONENGINE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qfileinfo.h>
-#include <private/qicon_p.h>
-#include <qpa/qplatformtheme.h>
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractFileIconEngine : public QPixmapIconEngine
-{
-public:
-    explicit QAbstractFileIconEngine(const QFileInfo &info, QPlatformTheme::IconOptions opts)
-        : QPixmapIconEngine(), m_fileInfo(info), m_options(opts) {}
-
-    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State) override;
-    QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
-
-    QFileInfo fileInfo() const { return m_fileInfo; }
-    QPlatformTheme::IconOptions options() const { return m_options; }
-
-    // Helper to convert a sequence of ints to a list of QSize
-    template <class It> static QList<QSize> toSizeList(It i1, It i2);
-
-protected:
-    virtual QPixmap filePixmap(const QSize &size, QIcon::Mode mode, QIcon::State) = 0;
-    virtual QString cacheKey() const;
-
-private:
-    const QFileInfo m_fileInfo;
-    const QPlatformTheme::IconOptions m_options;
-};
-
-template <class It>
-inline QList<QSize> QAbstractFileIconEngine::toSizeList(It i1, It i2)
-{
-    QList<QSize> result;
-    result.reserve(int(i2 - i1));
-    for ( ; i1 != i2; ++i1)
-        result.append(QSize(*i1, *i1));
-    return result;
-}
-
-QT_END_NAMESPACE
-
-#endif // QABSTRACTFILEICONENGINE_P_H
diff --git a/src/platformsupport/themes/themes.pro b/src/platformsupport/themes/themes.pro
index 668a843473..c524ded875 100644
--- a/src/platformsupport/themes/themes.pro
+++ b/src/platformsupport/themes/themes.pro
@@ -9,10 +9,4 @@ DEFINES += QT_NO_CAST_FROM_ASCII
 if(unix:!uikit)|qtConfig(xcb): \
     include($$PWD/genericunix/genericunix.pri)
 
-HEADERS += \
-    qabstractfileiconengine_p.h
-
-SOURCES += \
-    qabstractfileiconengine.cpp
-
 load(qt_module)