From c068b80727946328711c1385681b4a32ce5f0544 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Jun 2020 13:59:36 +0200 Subject: [PATCH] Move UNIX themes into QtGui Task-number: QTBUG-83255 Change-Id: I9e3aecd8e172b60121f472c840eaf2a5538af438 Reviewed-by: Liang Qi --- src/gui/.prev_CMakeLists.txt | 23 ++++++++ src/gui/CMakeLists.txt | 23 ++++++++ src/gui/platform/unix/dbusmenu/dbusmenu.pri | 15 ++++++ .../unix}/dbusmenu/qdbusmenuadaptor.cpp | 0 .../unix}/dbusmenu/qdbusmenuadaptor_p.h | 0 .../platform/unix}/dbusmenu/qdbusmenubar.cpp | 0 .../platform/unix}/dbusmenu/qdbusmenubar_p.h | 0 .../unix}/dbusmenu/qdbusmenuconnection.cpp | 2 +- .../unix}/dbusmenu/qdbusmenuconnection_p.h | 0 .../dbusmenu/qdbusmenuregistrarproxy.cpp | 0 .../dbusmenu/qdbusmenuregistrarproxy_p.h | 0 .../unix}/dbusmenu/qdbusmenutypes.cpp | 0 .../unix}/dbusmenu/qdbusmenutypes_p.h | 0 .../unix}/dbusmenu/qdbusplatformmenu.cpp | 0 .../unix}/dbusmenu/qdbusplatformmenu_p.h | 0 src/gui/platform/unix/dbustray/dbustray.pri | 11 ++++ .../platform/unix}/dbustray/qdbustrayicon.cpp | 6 +-- .../platform/unix}/dbustray/qdbustrayicon_p.h | 2 +- .../unix}/dbustray/qdbustraytypes.cpp | 8 +-- .../unix}/dbustray/qdbustraytypes_p.h | 0 .../dbustray/qstatusnotifieritemadaptor.cpp | 0 .../dbustray/qstatusnotifieritemadaptor_p.h | 0 .../unix}/dbustray/qxdgnotificationproxy.cpp | 0 .../unix}/dbustray/qxdgnotificationproxy_p.h | 6 +-- .../platform/unix}/qgenericunixthemes.cpp | 8 +-- .../platform/unix}/qgenericunixthemes_p.h | 8 +-- src/gui/platform/unix/unix.pri | 12 +++++ src/platformsupport/.prev_CMakeLists.txt | 3 -- src/platformsupport/CMakeLists.txt | 3 -- src/platformsupport/platformsupport.pro | 3 -- src/platformsupport/themes/CMakeLists.txt | 52 ------------------- .../themes/genericunix/dbusmenu/dbusmenu.pri | 19 ------- .../themes/genericunix/dbustray/dbustray.pri | 15 ------ .../themes/genericunix/genericunix.pri | 10 ---- src/platformsupport/themes/themes.pro | 12 ----- .../platforms/eglfs/.prev_CMakeLists.txt | 1 - src/plugins/platforms/eglfs/CMakeLists.txt | 1 - .../platforms/eglfs/api/qeglfsintegration.cpp | 2 +- .../eglfs/eglfsdeviceintegration.pro | 1 - .../platforms/xcb/.prev_CMakeLists.txt | 1 - src/plugins/platforms/xcb/CMakeLists.txt | 1 - src/plugins/platforms/xcb/xcb_qpa_lib.pro | 1 - .../platformthemes/gtk3/.prev_CMakeLists.txt | 1 - .../platformthemes/gtk3/CMakeLists.txt | 1 - src/plugins/platformthemes/gtk3/gtk3.pro | 2 +- .../xdgdesktopportal/CMakeLists.txt | 1 - .../xdgdesktopportal/xdgdesktopportal.pro | 2 +- src/src.pro | 1 + sync.profile | 1 - 49 files changed, 108 insertions(+), 150 deletions(-) create mode 100644 src/gui/platform/unix/dbusmenu/dbusmenu.pri rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuadaptor.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuadaptor_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenubar.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenubar_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuconnection.cpp (99%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuconnection_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuregistrarproxy.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenuregistrarproxy_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenutypes.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusmenutypes_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusplatformmenu.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbusmenu/qdbusplatformmenu_p.h (100%) create mode 100644 src/gui/platform/unix/dbustray/dbustray.pri rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qdbustrayicon.cpp (99%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qdbustrayicon_p.h (99%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qdbustraytypes.cpp (97%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qdbustraytypes_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qstatusnotifieritemadaptor.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qstatusnotifieritemadaptor_p.h (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qxdgnotificationproxy.cpp (100%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/dbustray/qxdgnotificationproxy_p.h (98%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/qgenericunixthemes.cpp (99%) rename src/{platformsupport/themes/genericunix => gui/platform/unix}/qgenericunixthemes_p.h (94%) delete mode 100644 src/platformsupport/themes/CMakeLists.txt delete mode 100644 src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri delete mode 100644 src/platformsupport/themes/genericunix/dbustray/dbustray.pri delete mode 100644 src/platformsupport/themes/genericunix/genericunix.pri delete mode 100644 src/platformsupport/themes/themes.pro diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 5db0168781a..56061ed7d2c 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -721,6 +721,29 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N Qt::DBus ) +qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h +) + +qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h + platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h + platform/unix/dbusmenu/qdbusmenuconnection.cpp platform/unix/dbusmenu/qdbusmenuconnection_p.h + platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h + platform/unix/dbusmenu/qdbusmenutypes.cpp platform/unix/dbusmenu/qdbusmenutypes_p.h + platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h + platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h + platform/unix/dbustray/qstatusnotifieritemadaptor.cpp platform/unix/dbustray/qstatusnotifieritemadaptor_p.h + platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h +) + qt_extend_target(Gui CONDITION IOS OR MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 7a7989630eb..ace304fdef4 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -869,6 +869,29 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N Qt::DBus ) +qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h +) + +qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h + platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h + platform/unix/dbusmenu/qdbusmenuconnection.cpp platform/unix/dbusmenu/qdbusmenuconnection_p.h + platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h + platform/unix/dbusmenu/qdbusmenutypes.cpp platform/unix/dbusmenu/qdbusmenutypes_p.h + platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) + SOURCES + platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h + platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h + platform/unix/dbustray/qstatusnotifieritemadaptor.cpp platform/unix/dbustray/qstatusnotifieritemadaptor_p.h + platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h +) + qt_extend_target(Gui CONDITION IOS OR MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h diff --git a/src/gui/platform/unix/dbusmenu/dbusmenu.pri b/src/gui/platform/unix/dbusmenu/dbusmenu.pri new file mode 100644 index 00000000000..c328f23144e --- /dev/null +++ b/src/gui/platform/unix/dbusmenu/dbusmenu.pri @@ -0,0 +1,15 @@ +HEADERS += \ + platform/unix/dbusmenu/qdbusmenuadaptor_p.h \ + platform/unix/dbusmenu/qdbusmenutypes_p.h \ + platform/unix/dbusmenu/qdbusmenuconnection_p.h \ + platform/unix/dbusmenu/qdbusmenubar_p.h \ + platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h \ + platform/unix/dbusmenu/qdbusplatformmenu_p.h + +SOURCES += \ + platform/unix/dbusmenu/qdbusmenuadaptor.cpp \ + platform/unix/dbusmenu/qdbusmenutypes.cpp \ + platform/unix/dbusmenu/qdbusmenuconnection.cpp \ + platform/unix/dbusmenu/qdbusmenubar.cpp \ + platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp \ + platform/unix/dbusmenu/qdbusplatformmenu.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp rename to src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h rename to src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp rename to src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenubar_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h rename to src/gui/platform/unix/dbusmenu/qdbusmenubar_p.h diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp similarity index 99% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp rename to src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp index 09470bccc6c..429460f9e8c 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp @@ -40,7 +40,7 @@ #include #ifndef QT_NO_SYSTEMTRAYICON -#include "qdbustrayicon_p.h" +#include "../dbustray/qdbustrayicon_p.h" #endif #include "qdbusmenuconnection_p.h" #include "qdbusmenuadaptor_p.h" diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h rename to src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp rename to src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h rename to src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp rename to src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h rename to src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp b/src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp rename to src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/gui/platform/unix/dbusmenu/qdbusplatformmenu_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h rename to src/gui/platform/unix/dbusmenu/qdbusplatformmenu_p.h diff --git a/src/gui/platform/unix/dbustray/dbustray.pri b/src/gui/platform/unix/dbustray/dbustray.pri new file mode 100644 index 00000000000..cc5b40ef427 --- /dev/null +++ b/src/gui/platform/unix/dbustray/dbustray.pri @@ -0,0 +1,11 @@ +HEADERS += \ + platform/unix/dbustray/qdbustrayicon_p.h \ + platform/unix/dbustray/qdbustraytypes_p.h \ + platform/unix/dbustray/qstatusnotifieritemadaptor_p.h \ + platform/unix/dbustray/qxdgnotificationproxy_p.h + +SOURCES += \ + platform/unix/dbustray/qdbustrayicon.cpp \ + platform/unix/dbustray/qdbustraytypes.cpp \ + platform/unix/dbustray/qstatusnotifieritemadaptor.cpp \ + platform/unix/dbustray/qxdgnotificationproxy.cpp diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp similarity index 99% rename from src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp rename to src/gui/platform/unix/dbustray/qdbustrayicon.cpp index ca740f967ea..e8fcb83c386 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp +++ b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp @@ -41,10 +41,10 @@ #ifndef QT_NO_SYSTEMTRAYICON -#include "qdbusmenuconnection_p.h" +#include #include "qstatusnotifieritemadaptor_p.h" -#include "qdbusmenuadaptor_p.h" -#include "qdbusplatformmenu_p.h" +#include +#include #include "qxdgnotificationproxy_p.h" #include diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/gui/platform/unix/dbustray/qdbustrayicon_p.h similarity index 99% rename from src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h rename to src/gui/platform/unix/dbustray/qdbustrayicon_p.h index edc115742c8..04eefe31543 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h +++ b/src/gui/platform/unix/dbustray/qdbustrayicon_p.h @@ -83,7 +83,7 @@ class QDBusTrayIcon: public QPlatformSystemTrayIcon Q_PROPERTY(QString attentionIconName READ attentionIconName NOTIFY attention) Q_PROPERTY(QIcon attentionIcon READ attentionIcon NOTIFY attention) Q_PROPERTY(QDBusPlatformMenu *menu READ menu NOTIFY menuChanged) - Q_MOC_INCLUDE("qdbusplatformmenu_p.h") + Q_MOC_INCLUDE() public: QDBusTrayIcon(); diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp similarity index 97% rename from src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp rename to src/gui/platform/unix/dbustray/qdbustraytypes.cpp index fc49fcbea96..97cc8b7f36f 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp +++ b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp @@ -53,7 +53,7 @@ #include #include #include -#include "qdbusplatformmenu_p.h" +#include QT_BEGIN_NAMESPACE @@ -73,7 +73,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) bool hasMediumIcon = false; qreal dpr = qGuiApp->devicePixelRatio(); QList toRemove; - Q_FOREACH (const QSize &size, sizes) { + for (const QSize &size : qAsConst(sizes)) { int maxSize = qMax(size.width(), size.height()); if (maxSize <= IconNormalSmallSize * dpr) hasSmallIcon = true; @@ -82,7 +82,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) else if (maxSize > IconSizeLimit * dpr) toRemove << size; } - Q_FOREACH (const QSize &size, toRemove) + for (const QSize &size : qAsConst(toRemove)) sizes.removeOne(size); if (!hasSmallIcon) sizes.append(QSize(IconNormalSmallSize * dpr, IconNormalSmallSize * dpr)); @@ -90,7 +90,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) sizes.append(QSize(IconNormalMediumSize * dpr, IconNormalMediumSize * dpr)); ret.reserve(sizes.size()); - foreach (QSize size, sizes) { + for (const QSize &size : qAsConst(sizes)) { // Protocol specifies ARGB32 format in network byte order QImage im = icon.pixmap(size).toImage().convertToFormat(QImage::Format_ARGB32); // letterbox if necessary to make it square diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h rename to src/gui/platform/unix/dbustray/qdbustraytypes_p.h diff --git a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp b/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp rename to src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor.cpp diff --git a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h b/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h similarity index 100% rename from src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h rename to src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h diff --git a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp b/src/gui/platform/unix/dbustray/qxdgnotificationproxy.cpp similarity index 100% rename from src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp rename to src/gui/platform/unix/dbustray/qxdgnotificationproxy.cpp diff --git a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h b/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h similarity index 98% rename from src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h rename to src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h index 2194a787eb7..495208f873a 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h +++ b/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h @@ -132,12 +132,12 @@ Q_SIGNALS: void NotificationClosed(uint id, uint reason); }; +QT_END_NAMESPACE + namespace org { namespace freedesktop { - typedef ::QXdgNotificationInterface Notifications; + using Notifications = QT_PREPEND_NAMESPACE(QXdgNotificationInterface); } } -QT_END_NAMESPACE - #endif diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp similarity index 99% rename from src/platformsupport/themes/genericunix/qgenericunixthemes.cpp rename to src/gui/platform/unix/qgenericunixthemes.cpp index 594dec88978..352c975400e 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/gui/platform/unix/qgenericunixthemes.cpp @@ -40,6 +40,7 @@ #include "qgenericunixthemes_p.h" #include "qpa/qplatformtheme_p.h" +#include "qpa/qplatformfontdatabase.h" // lcQpaFonts #include #include @@ -64,11 +65,11 @@ #include #include #ifndef QT_NO_DBUS -#include "qdbusplatformmenu_p.h" -#include "qdbusmenubar_p.h" +#include +#include #endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) -#include "qdbustrayicon_p.h" +#include #endif #include @@ -76,7 +77,6 @@ QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(qLcTray) -Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts") ResourceHelper::ResourceHelper() { diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/gui/platform/unix/qgenericunixthemes_p.h similarity index 94% rename from src/platformsupport/themes/genericunix/qgenericunixthemes_p.h rename to src/gui/platform/unix/qgenericunixthemes_p.h index f6acf00f39b..0870275888d 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/gui/platform/unix/qgenericunixthemes_p.h @@ -44,8 +44,8 @@ // 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 +// 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. @@ -72,7 +72,7 @@ public: class QGenericUnixThemePrivate; -class QGenericUnixTheme : public QPlatformTheme +class Q_GUI_EXPORT QGenericUnixTheme : public QPlatformTheme { Q_DECLARE_PRIVATE(QGenericUnixTheme) public: @@ -127,7 +127,7 @@ public: class QGnomeThemePrivate; -class QGnomeTheme : public QPlatformTheme +class Q_GUI_EXPORT QGnomeTheme : public QPlatformTheme { Q_DECLARE_PRIVATE(QGnomeTheme) public: diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri index b203e81b243..82eb63b11b3 100644 --- a/src/gui/platform/unix/unix.pri +++ b/src/gui/platform/unix/unix.pri @@ -21,3 +21,15 @@ if(unix:!uikit)|qtConfig(xcb) { qtHaveModule(dbus): QT_PRIVATE += dbus } + +if(unix:!uikit:!macos)|qtConfig(xcb) { + SOURCES += \ + platform/unix/qgenericunixthemes.cpp + HEADERS += \ + platform/unix/qgenericunixthemes_p.h + + qtHaveModule(dbus) { + include(dbusmenu/dbusmenu.pri) + qtConfig(systemtrayicon): include(dbustray/dbustray.pri) + } +} diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt index 157a53aecaf..4b2fce1c6c6 100644 --- a/src/platformsupport/.prev_CMakeLists.txt +++ b/src/platformsupport/.prev_CMakeLists.txt @@ -4,9 +4,6 @@ add_subdirectory(edid) add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) add_subdirectory(linuxofono) -if(QT_FEATURE_xcb OR (UNIX AND NOT MACOS AND NOT UIKIT)) - add_subdirectory(themes) -endif() if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) add_subdirectory(input) endif() diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index 3d2586e7f13..a2f8447c97e 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -4,9 +4,6 @@ add_subdirectory(edid) add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) # 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 406c21d6bdc..64ce2e4b163 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -6,9 +6,6 @@ SUBDIRS = \ devicediscovery \ fbconvenience -if(unix:!uikit:!macos)|qtConfig(xcb): \ - SUBDIRS += themes - qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) { SUBDIRS += input input.depends += devicediscovery diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt deleted file mode 100644 index 87b40732dad..00000000000 --- a/src/platformsupport/themes/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Generated from themes.pro. - -##################################################################### -## ThemeSupport Module: -##################################################################### - -qt_add_module(ThemeSupport - STATIC - INTERNAL_MODULE - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate -) - -#### Keys ignored in scope 1:.:.:themes.pro:: -# MODULE = "theme_support" - -## Scopes: -##################################################################### - -qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT UIKIT) - SOURCES - genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h -) - -qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT) - SOURCES - genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h - genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h - genericunix/dbusmenu/qdbusmenuconnection.cpp genericunix/dbusmenu/qdbusmenuconnection_p.h - genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h - genericunix/dbusmenu/qdbusmenutypes.cpp genericunix/dbusmenu/qdbusmenutypes_p.h - genericunix/dbusmenu/qdbusplatformmenu.cpp genericunix/dbusmenu/qdbusplatformmenu_p.h - INCLUDE_DIRECTORIES - genericunix/dbusmenu - LIBRARIES - Qt::DBus -) - -qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT) - SOURCES - genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h - genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h - genericunix/dbustray/qstatusnotifieritemadaptor.cpp genericunix/dbustray/qstatusnotifieritemadaptor_p.h - genericunix/dbustray/qxdgnotificationproxy.cpp genericunix/dbustray/qxdgnotificationproxy_p.h - INCLUDE_DIRECTORIES - genericunix/dbustray - LIBRARIES - Qt::DBus -) diff --git a/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri b/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri deleted file mode 100644 index 662ebfdae67..00000000000 --- a/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri +++ /dev/null @@ -1,19 +0,0 @@ -QT_FOR_PRIVATE += dbus - -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qdbusmenuadaptor_p.h \ - $$PWD/qdbusmenutypes_p.h \ - $$PWD/qdbusmenuconnection_p.h \ - $$PWD/qdbusmenubar_p.h \ - $$PWD/qdbusmenuregistrarproxy_p.h \ - $$PWD/qdbusplatformmenu_p.h \ - -SOURCES += \ - $$PWD/qdbusmenuadaptor.cpp \ - $$PWD/qdbusmenutypes.cpp \ - $$PWD/qdbusmenuconnection.cpp \ - $$PWD/qdbusmenubar.cpp \ - $$PWD/qdbusmenuregistrarproxy.cpp \ - $$PWD/qdbusplatformmenu.cpp \ diff --git a/src/platformsupport/themes/genericunix/dbustray/dbustray.pri b/src/platformsupport/themes/genericunix/dbustray/dbustray.pri deleted file mode 100644 index f703e24ba94..00000000000 --- a/src/platformsupport/themes/genericunix/dbustray/dbustray.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT_FOR_PRIVATE += dbus - -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qdbustrayicon_p.h \ - $$PWD/qdbustraytypes_p.h \ - $$PWD/qstatusnotifieritemadaptor_p.h \ - $$PWD/qxdgnotificationproxy_p.h \ - -SOURCES += \ - $$PWD/qdbustrayicon.cpp \ - $$PWD/qdbustraytypes.cpp \ - $$PWD/qstatusnotifieritemadaptor.cpp \ - $$PWD/qxdgnotificationproxy.cpp \ diff --git a/src/platformsupport/themes/genericunix/genericunix.pri b/src/platformsupport/themes/genericunix/genericunix.pri deleted file mode 100644 index 11da533bc41..00000000000 --- a/src/platformsupport/themes/genericunix/genericunix.pri +++ /dev/null @@ -1,10 +0,0 @@ -HEADERS += $$PWD/qgenericunixthemes_p.h -SOURCES += $$PWD/qgenericunixthemes.cpp - -qtConfig(dbus) { - include(dbusmenu/dbusmenu.pri) - - qtConfig(systemtrayicon) { - include(dbustray/dbustray.pri) - } -} diff --git a/src/platformsupport/themes/themes.pro b/src/platformsupport/themes/themes.pro deleted file mode 100644 index c524ded875f..00000000000 --- a/src/platformsupport/themes/themes.pro +++ /dev/null @@ -1,12 +0,0 @@ -TARGET = QtThemeSupport -MODULE = theme_support - -QT = core-private gui-private -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII - -if(unix:!uikit)|qtConfig(xcb): \ - include($$PWD/genericunix/genericunix.pri) - -load(qt_module) diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 900be49379e..29e9f6d9b09 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate - Qt::ThemeSupportPrivate ) #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 8e625fdc583..88dc0edb8f7 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -26,7 +26,6 @@ qt_add_module(EglFSDeviceIntegration Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate - Qt::ThemeSupportPrivate EGL::EGL # special case ) diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index ecabfee101f..9b479a21c19 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -69,7 +69,7 @@ #include #include -#include +#include #include #include #ifndef QT_NO_OPENGL diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index 87eb8515eb4..9bbaad04c62 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -11,7 +11,6 @@ MODULE = eglfsdeviceintegration QT += \ core-private gui-private \ devicediscovery_support-private \ - theme_support-private \ fb_support-private egl_support-private qtHaveModule(input_support-private): \ diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 83df27ddd0d..350e97dd1f4 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -43,7 +43,6 @@ qt_add_module(XcbQpa Qt::CorePrivate Qt::EdidSupportPrivate Qt::GuiPrivate - Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate XCB::ICCCM XCB::IMAGE diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 28861862d87..5cb208a7f2d 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -43,7 +43,6 @@ qt_add_module(XcbQpa Qt::CorePrivate Qt::EdidSupportPrivate Qt::GuiPrivate - Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate XCB::ICCCM XCB::IMAGE diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 0e168b9e1ca..49d5cf7b639 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ - theme_support-private \ edid_support-private \ xkbcommon_support-private diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt index 41f7c79a156..764675101c9 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_plugin(QGtk3ThemePlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:gtk3.pro:: diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index fca48c5fc9f..042282faf69 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -25,7 +25,6 @@ qt_internal_add_plugin(QGtk3ThemePlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:gtk3.pro:: diff --git a/src/plugins/platformthemes/gtk3/gtk3.pro b/src/plugins/platformthemes/gtk3/gtk3.pro index cac6f7054d3..e63d2dd614a 100644 --- a/src/plugins/platformthemes/gtk3/gtk3.pro +++ b/src/plugins/platformthemes/gtk3/gtk3.pro @@ -5,7 +5,7 @@ PLUGIN_EXTENDS = - PLUGIN_CLASS_NAME = QGtk3ThemePlugin load(qt_plugin) -QT += core-private gui-private theme_support-private +QT += core-private gui-private CONFIG += X11 QMAKE_USE += gtk3 diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 984759f9015..2466253af9a 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QXdgDesktopPortalThemePlugin Qt::DBus Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:xdgdesktopportal.pro:: diff --git a/src/plugins/platformthemes/xdgdesktopportal/xdgdesktopportal.pro b/src/plugins/platformthemes/xdgdesktopportal/xdgdesktopportal.pro index 0a71484cf93..4f6e74386c8 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/xdgdesktopportal.pro +++ b/src/plugins/platformthemes/xdgdesktopportal/xdgdesktopportal.pro @@ -5,7 +5,7 @@ PLUGIN_EXTENDS = - PLUGIN_CLASS_NAME = QXdgDesktopPortalThemePlugin load(qt_plugin) -QT += core-private dbus gui-private theme_support-private +QT += core-private dbus gui-private HEADERS += \ qxdgdesktopportaltheme.h \ diff --git a/src/src.pro b/src/src.pro index a38a972404c..da827979d21 100644 --- a/src/src.pro +++ b/src/src.pro @@ -182,6 +182,7 @@ qtConfig(dbus) { qtConfig(accessibility-atspi-bridge): \ src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml + src_gui.depends += src_dbus } android { diff --git a/sync.profile b/sync.profile index c9359dde575..e91a9c5c4ea 100644 --- a/sync.profile +++ b/sync.profile @@ -15,7 +15,6 @@ "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery", "QtInputSupport" => "$basedir/src/platformsupport/input", "QtXkbCommonSupport" => "$basedir/src/platformsupport/input/xkbcommon", - "QtThemeSupport" => "$basedir/src/platformsupport/themes", "QtEglSupport" => "$basedir/src/platformsupport/eglconvenience", "QtFbSupport" => "$basedir/src/platformsupport/fbconvenience", "QtGlxSupport" => "$basedir/src/platformsupport/glxconvenience",