diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-10-26 15:02:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-26 15:43:01 +0000 |
| commit | c68a2a6ebef783ba75134664309561f54349c152 (patch) | |
| tree | e9b56e7e4d5993cd8f8d6d33024321d1e72bd9d2 | |
| parent | 1431b8235d977a0a1decff1cd3b9132ef8e7483e (diff) | |
| download | qtapplicationmanager-c68a2a6ebef783ba75134664309561f54349c152.tar.gz | |
Fix broken QtWaylandCompositor dependency
Change-Id: Ie6e3af20605135ba40ca4f59ac648d08e7c2f2fa
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit afe24a0d5f17fc267ff81fbd729351b6209c74c0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/main-lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/shared-main-lib/frametimer.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main-lib/CMakeLists.txt b/src/main-lib/CMakeLists.txt index 13d38de6..d58173d6 100644 --- a/src/main-lib/CMakeLists.txt +++ b/src/main-lib/CMakeLists.txt @@ -51,6 +51,10 @@ qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_am_installer Qt::AppManPackagePrivate ) +qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_am_multi_process + PUBLIC_LIBRARIES + Qt::WaylandCompositor +) qt_internal_extend_target(AppManMainPrivate CONDITION WIN32 PUBLIC_LIBRARIES diff --git a/src/shared-main-lib/frametimer.h b/src/shared-main-lib/frametimer.h index bd8f8714..1689dd8f 100644 --- a/src/shared-main-lib/frametimer.h +++ b/src/shared-main-lib/frametimer.h @@ -38,9 +38,6 @@ #include <QtAppManCommon/global.h> #include <limits> -#if defined(AM_MULTI_PROCESS) -# include <QtWaylandCompositor/QWaylandQuickSurface> -#endif QT_BEGIN_NAMESPACE_AM |