diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-23 15:12:24 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-25 14:06:38 +0200 |
| commit | 3a65f72f1df0a8b9ebbf568a714925be57c5da73 (patch) | |
| tree | 0b1c3d196ae12fceead531a8ab51074011b45e39 /tests | |
| parent | b743fc7a1e6ee680ca89ae17fb6b521178fd09a9 (diff) | |
Indicate from the client buffer integration if decorations are supported
Custom client buffer integrations may not care about window decorations.
Setting QT_WAYLAND_DISABLE_WINDOWDECORATION is tedious and error-prone.
And it cannot be omitted since things like input events will be off if the
common client code thinks decorations are in use but the client buffer
integration does not render them at all.
Therefore add a supportsWindowDecoration() virtual in addition to the
environment variable.
Change-Id: If8f621182d5c230f4d8d679c050f5d27aed6c2fb
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/tst_client.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/client/tst_client.cpp b/tests/auto/client/tst_client.cpp index e13d738dc..113f9d9a8 100644 --- a/tests/auto/client/tst_client.cpp +++ b/tests/auto/client/tst_client.cpp @@ -248,6 +248,11 @@ int main(int argc, char **argv) setenv("XDG_RUNTIME_DIR", ".", 1); setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin + // wayland-egl hangs in the test setup when we try to initialize. Until it gets + // figured out, avoid clientBufferIntegration() from being called in + // QWaylandWindow::createDecorations(). + setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); + MockCompositor compositor; compositor.setOutputGeometry(QRect(QPoint(), screenSize)); |