diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 14:04:04 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-04-04 12:10:05 +0000 |
| commit | 8663de3fa789d8b8e10c5580b37f6eb3beac9ed6 (patch) | |
| tree | 326bb613e96f8944b1bb93d9ff90149725b7c26c /tests/auto/client/surface/tst_surface.cpp | |
| parent | c87451570f93fd7bf8653c27d6120f6436b9aaae (diff) | |
| download | qtwayland-8663de3fa789d8b8e10c5580b37f6eb3beac9ed6.tar.gz | |
Compositor: Don't require OpenGL to build the QML APIs
[ChangeLog][Compositor API] The compositor API now works without OpenGL support.
This makes the compositor API work with shared memory clients only. If OpenGL
clients connect they will currently punch holes in the compositor window, but
fixing that is out of scope for this patch.
Fixes: QTBUG-74896
Change-Id: I6c1ba82f28ba9edecf380e471124e15d16f9518e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests/auto/client/surface/tst_surface.cpp')
| -rw-r--r-- | tests/auto/client/surface/tst_surface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/client/surface/tst_surface.cpp b/tests/auto/client/surface/tst_surface.cpp index dddff086..9659235a 100644 --- a/tests/auto/client/surface/tst_surface.cpp +++ b/tests/auto/client/surface/tst_surface.cpp @@ -28,7 +28,9 @@ #include "mockcompositor.h" #include <QtGui/QRasterWindow> +#if QT_CONFIG(opengl) #include <QtGui/QOpenGLWindow> +#endif using namespace MockCompositor; @@ -39,7 +41,9 @@ private slots: void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } void createDestroySurface(); void waitForFrameCallbackRaster(); +#if QT_CONFIG(opengl) void waitForFrameCallbackGl(); +#endif void negotiateShmFormat(); }; @@ -89,6 +93,7 @@ void tst_surface::waitForFrameCallbackRaster() } } +#if QT_CONFIG(opengl) void tst_surface::waitForFrameCallbackGl() { QSKIP("TODO: This currently fails, needs a fix"); @@ -129,6 +134,7 @@ void tst_surface::waitForFrameCallbackGl() bufferSpy.removeFirst(); } } +#endif // QT_CONFIG(opengl) void tst_surface::negotiateShmFormat() { |