diff options
| author | David Redondo <qt@david-redondo.de> | 2023-12-06 14:39:55 +0100 |
|---|---|---|
| committer | David Redondo <qt@david-redondo.de> | 2023-12-07 23:04:59 +0100 |
| commit | a2ff329d2eb893ffae0d1cd18dd76bd494781295 (patch) | |
| tree | de023474c2be76a63891b30046006f6289101f1f /src/gui/platform/unix/qgenericunixservices.cpp | |
| parent | 6866e6f2fa1cfa8f91a940936296d3ecb5317640 (diff) | |
Introduce a configure feature for Wayland
Using the presence of the wayland-client lib as a condition.
Fixes: QTBUG-117386
Change-Id: If4336965ea06e3f4b06e9af661efdec38ba46136
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/platform/unix/qgenericunixservices.cpp')
| -rw-r--r-- | src/gui/platform/unix/qgenericunixservices.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp index 3a289cda452..457981c23fb 100644 --- a/src/gui/platform/unix/qgenericunixservices.cpp +++ b/src/gui/platform/unix/qgenericunixservices.cpp @@ -418,6 +418,7 @@ QByteArray QGenericUnixServices::desktopEnvironment() const template<typename F> void runWithXdgActivationToken(F &&functionToCall) { +#if QT_CONFIG(wayland) QWindow *window = qGuiApp->focusWindow(); if (!window) { @@ -439,6 +440,9 @@ void runWithXdgActivationToken(F &&functionToCall) &QNativeInterface::Private::QWaylandWindow::xdgActivationTokenCreated, waylandWindow, functionToCall, Qt::SingleShotConnection); waylandWindow->requestXdgActivationToken(waylandApp->lastInputSerial()); +#else + functionToCall({}); +#endif } bool QGenericUnixServices::openUrl(const QUrl &url) |