diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:57:02 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:57:02 +0100 |
| commit | 552bf3adcc48c669f9dfbda5818142fb18c9e957 (patch) | |
| tree | 3edf8d919d102452fce811943d2ae85a812eb708 | |
| parent | a0a0fb4479149c611b9431b13f7368d6ae7f44a1 (diff) | |
| parent | 0b7bb2bd2d7404c42dd782975b665c9415409e0c (diff) | |
| download | qtsvg-baserock/morph.tar.gz | |
Merge v5.1.0 releasebaserock/morph
| -rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 | ||||
| -rw-r--r-- | examples/svg/opengl/opengl.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro index 45f3f19..dd3211f 100644 --- a/examples/svg/opengl/framebufferobject/framebufferobject.pro +++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro @@ -1,3 +1,5 @@ +contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x") + QT += widgets opengl svg HEADERS += glwidget.h diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro index 9ebf5ed..723efad 100644 --- a/examples/svg/opengl/opengl.pro +++ b/examples/svg/opengl/opengl.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS += framebufferobject +qtHaveModule(widgets):!contains(QT_CONFIG, opengles2): SUBDIRS += framebufferobject |