diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-03-02 17:02:15 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-03-08 11:00:03 +0000 |
| commit | 42a51460a34a4e593013e788089b1fc6bfe405fc (patch) | |
| tree | 39ebf36ebe7f3a29c80fb960cd5b61ee9af93c4e | |
| parent | 1370438ac99b64012517d1110fa8a2cd71dd4423 (diff) | |
QWindow::requestActivate() is not supported on Wayland
Return false for the WindowActivation capability to ensure we don't run tests
that require it.
Change-Id: Ia24d6eef02d462a25f3d50597debda9e062b3955
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 | ||||
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index fe1655c9f..b804988b2 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -179,6 +179,8 @@ bool QWaylandIntegration::hasCapability(QPlatformIntegration::Capability cap) co return true; case RasterGLSurface: return true; + case WindowActivation: + return false; default: return QPlatformIntegration::hasCapability(cap); } } diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 7d868b30b..fdfd66688 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -930,8 +930,7 @@ void QWaylandWindow::restoreMouseCursor(QWaylandInputDevice *device) void QWaylandWindow::requestActivateWindow() { - // no-op. Wayland does not have activation protocol, - // we rely on compositor setting keyboard focus based on window stacking. + qCWarning(lcQpaWayland) << "Wayland does not support QWindow::requestActivate()"; } void QWaylandWindow::unfocus() |