diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:57:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:04:02 +0200 |
| commit | c51d26b6ec7869641441d01597c3e7acc643f93f (patch) | |
| tree | 69ee279e12be73ae385e087c9d89ce7bc8480446 /examples | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 967c18d29694fdeab858691a80cb8400fd02ec33 (diff) | |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Id635e0c27df5d8e3852d12bd6433c6463bf4eadc
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/graphicsview/boxes/boxes.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index a4b253c5803..93621878f1d 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -1,5 +1,11 @@ QT += opengl widgets +contains(QT_CONFIG, opengles.) { + contains(QT_CONFIG, angle): \ + warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c") + error("This example requires Qt to be configured with -opengl desktop") +} + HEADERS += 3rdparty/fbm.h \ glbuffers.h \ glextensions.h \ |