AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move QAbstractFileIconEngine into QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: Iab502c51600b96f315113b08fa473ed28a5457fc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-03-31 16:07:55 +02:00
parent 87d32424de
commit 788cd98b35
19 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/CMakeLists.txt
View File

@ -65,6 +65,7 @@ qt_add_module(Gui
image/qicon.cpp image/qicon.h image/qicon_p.h
image/qiconengine.cpp image/qiconengine.h
image/qiconengineplugin.cpp image/qiconengineplugin.h
image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qiconloader.cpp image/qiconloader_p.h
image/qimage.cpp image/qimage.h image/qimage_p.h
image/qimage_conversions.cpp

2
src/gui/image/image.pri
View File

@ -26,6 +26,7 @@ HEADERS += \
image/qiconloader_p.h \
image/qiconengine.h \
image/qiconengineplugin.h \
image/qabstractfileiconengine_p.h
SOURCES += \
image/qbitmap.cpp \
@ -47,6 +48,7 @@ SOURCES += \
image/qiconloader.cpp \
image/qiconengine.cpp \
image/qiconengineplugin.cpp \
image/qabstractfileiconengine.cpp
qtConfig(movie) {
HEADERS += image/qmovie.h

0
src/platformsupport/themes/qabstractfileiconengine.cpp → src/gui/image/qabstractfileiconengine.cpp
View File

2
src/platformsupport/themes/qabstractfileiconengine_p.h → src/gui/image/qabstractfileiconengine_p.h
View File

@ -57,7 +57,7 @@
QT_BEGIN_NAMESPACE
class QAbstractFileIconEngine : public QPixmapIconEngine
class Q_GUI_EXPORT QAbstractFileIconEngine : public QPixmapIconEngine
{
public:
explicit QAbstractFileIconEngine(const QFileInfo &info, QPlatformTheme::IconOptions opts)

4
src/platformsupport/CMakeLists.txt
View File

@ -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()

6
src/platformsupport/platformsupport.pro
View File

@ -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

2
src/platformsupport/themes/CMakeLists.txt
View File

@ -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

6
src/platformsupport/themes/themes.pro
View File

@ -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)

1
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -60,7 +60,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
Qt::CorePrivate
Qt::Gui
Qt::GuiPrivate
Qt::ThemeSupportPrivate
)
# special case begin

4
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -93,9 +93,7 @@ LIBS += -framework AppKit -framework CoreServices -framework Carbon -framework I
DEFINES += QT_NO_FOREACH
QT += \
core-private gui-private \
theme_support-private
QT += core-private gui-private
CONFIG += no_app_extension_api_only

2
src/plugins/platforms/cocoa/qcocoatheme.mm
View File

@ -58,7 +58,7 @@
#include <QtGui/qtextformat.h>
#include <QtGui/private/qcoretextfontdatabase_p.h>
#include <QtGui/private/qfontengine_coretext_p.h>
#include <QtThemeSupport/private/qabstractfileiconengine_p.h>
#include <QtGui/private/qabstractfileiconengine_p.h>
#include <qpa/qplatformdialoghelper.h>
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformnativeinterface.h>

2
src/plugins/platforms/direct2d/direct2d.pro
View File

@ -3,7 +3,7 @@ TARGET = qdirect2d
QT += \
core-private gui-private \
eventdispatcher_support-private \
fontdatabase_support-private theme_support-private
fontdatabase_support-private
LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid
QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1

1
src/plugins/platforms/vnc/CMakeLists.txt
View File

@ -26,7 +26,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
Qt::GuiPrivate
Qt::Network
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate
)
#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:

2
src/plugins/platforms/vnc/vnc.pro
View File

@ -2,7 +2,7 @@ TARGET = qvnc
QT += \
core-private network gui-private \
service_support-private theme_support-private fb_support-private \
service_support-private fb_support-private \
eventdispatcher_support-private fontdatabase_support-private
qtHaveModule(input_support-private): \

1
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -55,7 +55,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ThemeSupportPrivate
dwmapi
imm32
oleaut32

2
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -76,7 +76,7 @@
#include <QtGui/qpainter.h>
#include <QtGui/qpixmapcache.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtThemeSupport/private/qabstractfileiconengine_p.h>
#include <QtGui/private/qabstractfileiconengine_p.h>
#include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h>
#include <private/qhighdpiscaling_p.h>
#include <private/qsystemlibrary_p.h>

2
src/plugins/platforms/windows/windows.pro
View File

@ -3,7 +3,7 @@ TARGET = qwindows
QT += \
core-private gui-private \
eventdispatcher_support-private \
fontdatabase_support-private theme_support-private
fontdatabase_support-private
qtConfig(opengl): QT += opengl-private

2
src/plugins/platformthemes/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from platformthemes.pro.
if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression)
if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression AND NOT APPLE AND NOT WIN32)
add_subdirectory(xdgdesktopportal)
endif()
if(QT_FEATURE_gtk3 AND TARGET Qt::Widgets)

2
src/plugins/platformthemes/platformthemes.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
QT_FOR_CONFIG += widgets-private
qtConfig(dbus):qtConfig(regularexpression):qtConfig(mimetype): SUBDIRS += xdgdesktopportal
qtConfig(dbus):qtConfig(regularexpression):qtConfig(mimetype):!darwin:!win32: SUBDIRS += xdgdesktopportal
qtHaveModule(widgets):qtConfig(gtk3): SUBDIRS += gtk3