diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 16:07:55 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-03 18:47:56 +0200 |
commit | 788cd98b357fdc9dd8b0f0b1baf1033f0efa1f11 (patch) | |
tree | 7e54f6a591eb92ff83bffac59764ee764523bc81 /src/plugins | |
parent | 87d32424de2f471a520c1f3ba0c3035fbff7ee06 (diff) |
Move QAbstractFileIconEngine into QtGui
Task-number: QTBUG-83255
Change-Id: Iab502c51600b96f315113b08fa473ed28a5457fc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/direct2d/direct2d.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/vnc.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 | ||||
-rw-r--r-- | src/plugins/platformthemes/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/platformthemes/platformthemes.pro | 2 |
11 files changed, 8 insertions, 13 deletions
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 4921ee1ef3..9d578e7eed 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -60,7 +60,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate ) # special case begin diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index c4d0750b2a..c0a7b4e6cf 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -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 diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 543348c7b6..1b82b35795 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -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> diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index 09dce90291..fc21c6f843 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -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 diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index b6ac43794a..e33e5c603f 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -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>: diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 1fa682303f..7b50143fd7 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -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): \ diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index f27f24ee73..1c5e2eb309 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -55,7 +55,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate dwmapi imm32 oleaut32 diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 25e083fd5c..36831bdd81 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -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> diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 484954c7b2..c9549f0eaf 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -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 diff --git a/src/plugins/platformthemes/CMakeLists.txt b/src/plugins/platformthemes/CMakeLists.txt index 6aa17c234c..a0e8383ba2 100644 --- a/src/plugins/platformthemes/CMakeLists.txt +++ b/src/plugins/platformthemes/CMakeLists.txt @@ -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) diff --git a/src/plugins/platformthemes/platformthemes.pro b/src/plugins/platformthemes/platformthemes.pro index 3bcc659199..07deff036d 100644 --- a/src/plugins/platformthemes/platformthemes.pro +++ b/src/plugins/platformthemes/platformthemes.pro @@ -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 |