diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-17 13:59:36 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-22 09:12:14 +0200 |
| commit | c068b80727946328711c1385681b4a32ce5f0544 (patch) | |
| tree | e41100a02d7212db321ca6797cd003d333de0ab8 /src/plugins/platforms | |
| parent | 8ba9d2e0220777bc1a2322eeece7fa9a5c55a96d (diff) | |
Move UNIX themes into QtGui
Task-number: QTBUG-83255
Change-Id: I9e3aecd8e172b60121f472c840eaf2a5538af438
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/eglfsdeviceintegration.pro | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 1 |
7 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 900be49379..29e9f6d9b0 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:<TRUE>: diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 8e625fdc58..88dc0edb8f 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 ecabfee101..9b479a21c1 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -69,7 +69,7 @@ #include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixservices_p.h> -#include <QtThemeSupport/private/qgenericunixthemes_p.h> +#include <QtGui/private/qgenericunixthemes_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtFbSupport/private/qfbvthandler_p.h> #ifndef QT_NO_OPENGL diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index 87eb8515eb..9bbaad04c6 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 83df27ddd0..350e97dd1f 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 28861862d8..5cb208a7f2 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 0e168b9e1c..49d5cf7b63 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 |