diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-02-05 13:41:21 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-02-05 19:53:25 +0000 |
| commit | 707e6f528fc79db236d282e7ea41eb952c825433 (patch) | |
| tree | a03bc0a339bdcf6dbf0eeb88e6401f019d8ddd4e /tests/auto/auto.pro | |
| parent | 80eabc56349b5efe4acf3fcb467b5b2d6491131f (diff) | |
Build (and fail) Quick with -no-opengl
Disable qmltest, particles, Quick examples and tests.
Also guard private QOpenGL header includes because, unlike the public
QOpenGL* headers, this is not done in the private headers.
This allows build attempts against a -no-opengl qtbase. It will of course
fail when encontering the GL symbols and QOpenGL class usage in Quick/SG.
Change-Id: I323f7a8b8854cc6e486e264517df30be3e5f8d3c
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 425e88b983..cf3da263ca 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,15 +1,20 @@ TEMPLATE=subdirs -SUBDIRS=\ - qml \ - quick \ - particles \ - qmltest \ - qmldevtools \ + +SUBDIRS = \ cmake \ installed_cmake \ - toolsupport + qmldevtools + +qtHaveModule(quick):contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += \ + qml \ + quick \ + particles \ + qmltest \ + toolsupport -qtHaveModule(widgets): SUBDIRS += quickwidgets + qtHaveModule(widgets): SUBDIRS += quickwidgets +} qmldevtools.CONFIG = host_build |