diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-18 17:07:44 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-05 15:30:02 +0200 |
| commit | a2259cac9bdb3feb5b2312a928125a1ddd40af6d (patch) | |
| tree | 4d4537a8222981c78845f6f59b837f016675d30f /src/compositor/global/qtwaylandcompositorglobal_p.h | |
| parent | 809176b8bccb4e0644f484a44189749ee87e2e3e (diff) | |
| download | qtwayland-a2259cac9bdb3feb5b2312a928125a1ddd40af6d.tar.gz | |
Restructure configure features
Create a new module WaylandGlobalPrivate that is merely a collection of
build features that are shared by client, compositor and plugins of
qtwayland.
Move the features wayland-client and wayland-server to
WaylandGlobalPrivate to be able to access both features in
src/CMakeLists.txt. This removes the need for explicitly including the
configure.cmake files of client and compositor, which fixes QTBUG-88261.
Move the features that are defined in both, client and compositor, to
WaylandGlobalPrivate.
The module is defined in src/CMakeLists.txt to ensure that the
targets created by the qt_find_package calls in src/configure.cmake are
accessible in subdirectories below src/.
We need the (nearly) empty src/global directory to satisfy syncqt.
We cannot pass NO_SYNC_QT to qt_internal_add_module, because that
prevents the creation of qtwaylandglobal-config_p.h.
Fixes: QTBUG-88261
Fixes: QTBUG-91705
Change-Id: I776632a86ffe96886dc12f1f675f9ab56a2faf2a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/compositor/global/qtwaylandcompositorglobal_p.h')
| -rw-r--r-- | src/compositor/global/qtwaylandcompositorglobal_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compositor/global/qtwaylandcompositorglobal_p.h b/src/compositor/global/qtwaylandcompositorglobal_p.h index 11a4a3d7..102e738e 100644 --- a/src/compositor/global/qtwaylandcompositorglobal_p.h +++ b/src/compositor/global/qtwaylandcompositorglobal_p.h @@ -41,6 +41,7 @@ // We mean it. // +#include <QtWaylandGlobal/private/qtwaylandglobal-config_p.h> #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtGui/private/qtguiglobal_p.h> #include <QtWaylandCompositor/private/qtwaylandcompositor-config_p.h> |