summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-12-12 10:45:27 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-12-12 13:25:10 +0100
commitcd1258c0952c38346fac8d644b7152ee0971771d (patch)
tree54a0566cb3ef0c17c1e15bb807854902b67da751 /src
parent3a051fac4500f9d41bf97bd07993d4238f167c30 (diff)
downloadqtapplicationmanager-cd1258c0952c38346fac8d644b7152ee0971771d.tar.gz
CMake: Fix missing waylandwindow.h include error
The header stopped being generated by syncqt/cpp on certain platforms because we only generate headers that meet the qt_internal_extend_target conditions. In this case qtwayland is not available on macOS, and thus the waylandwindow.h header is not generated. Fix windowframetimer.cpp to include it conditionally only if the multi process feature is enabled. Not generating the header is fine in this case, because the whole module is Private, even though the header has no _p.h suffix. This unblocks the build with syncqt/cpp. Fixes: QTBUG-109337 Change-Id: I0a38af6d23e5d1c9e040281a52a3b719106382b9 Reviewed-by: Zoltan Gera <zoltan.gera@qt.io> Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/main-lib/windowframetimer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main-lib/windowframetimer.cpp b/src/main-lib/windowframetimer.cpp
index e944c4f0..495e66ac 100644
--- a/src/main-lib/windowframetimer.cpp
+++ b/src/main-lib/windowframetimer.cpp
@@ -7,7 +7,10 @@
#include <qqmlinfo.h>
+#if defined(AM_MULTI_PROCESS)
#include "waylandwindow.h"
+#endif
+
#include "inprocesswindow.h"
#include "qmlinprocessapplicationmanagerwindow.h"