diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-06-24 12:45:48 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-20 08:24:21 +0000 |
| commit | b6dff11dc9781b677c02c8308a44e85f2d919fa0 (patch) | |
| tree | c7e7c0f3d3a8eed8222ff763ae295c074acc5e53 /config.tests | |
| parent | ef3e687fe6b983fb0a5bf648f2d66f2eadd85b58 (diff) | |
Compile with -no-opengl
QtWayland has not compiled without OpenGL for a while.
This patch fixes the compilation issues and removes the old config variable,
"QT_WAYLAND_GL_CONFIG" and instead checks for the presence of "opengl" in
"QT_CONFIG". A new define is also introduced, QT_WAYLAND_COMPOSITOR_QUICK,
because it may eventually be possible to use create a QtQuick compositor
without OpenGL.
Task-number: QTBUG-54322
Change-Id: Ica7b3b320212d4ae1f8b1053725b73c83739c73c
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/glx/glx.pro | 2 | ||||
| -rw-r--r-- | config.tests/xcomposite/xcomposite.pro | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config.tests/glx/glx.pro b/config.tests/glx/glx.pro index 26f048f08..74cc60837 100644 --- a/config.tests/glx/glx.pro +++ b/config.tests/glx/glx.pro @@ -1,6 +1,8 @@ TARGET = glx QT = core +!contains(QT_CONFIG, opengl): error("glx support requires Qt configured with OpenGL") + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += x11 gl diff --git a/config.tests/xcomposite/xcomposite.pro b/config.tests/xcomposite/xcomposite.pro index 1c885357b..6838970a6 100644 --- a/config.tests/xcomposite/xcomposite.pro +++ b/config.tests/xcomposite/xcomposite.pro @@ -1,6 +1,8 @@ TARGET = xcomposite QT = core +!contains(QT_CONFIG, opengl): error("xcomposite support requires Qt configured with OpenGL") + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += xcomposite |