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 /src/quick/scenegraph/coreapi/qsggeometry.cpp | |
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 'src/quick/scenegraph/coreapi/qsggeometry.cpp')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 5012f6a31b..cbc5f86527 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -42,7 +42,10 @@ #include <qopenglcontext.h> #include <qopenglfunctions.h> + +#ifndef QT_NO_OPENGL #include <private/qopenglextensions_p.h> +#endif #ifdef Q_OS_QNX #include <malloc.h> |