diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-03 21:20:30 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 19:32:21 +0200 |
commit | a4ec90175c76ce35688acc06cdf93e9cab886223 (patch) | |
tree | 64d6a1424f5a18a0296f49849e35f600dbc9c275 /examples/widgets | |
parent | 7d4bc536a27be540516a0403e114668f9eee65bb (diff) |
purge vestiges of opengl es 1 support
amends 0d5170256c1.
Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'examples/widgets')
-rw-r--r-- | examples/widgets/painting/shared/shared.pri | 2 | ||||
-rw-r--r-- | examples/widgets/widgets.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index af027e081a..c8d119f4e5 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/examples/widgets/painting/shared/shared.pri @@ -1,6 +1,6 @@ INCLUDEPATH += $$PWD -qtHaveModule(opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { +qtHaveModule(opengl)|contains(QT_CONFIG, opengles2) { DEFINES += QT_OPENGL_SUPPORT QT += opengl widgets } diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index d7d3dbc445..cc489b5c16 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -22,11 +22,11 @@ SUBDIRS = \ tutorials \ widgets -contains(QT_CONFIG, opengl(es1|es2)?) { +contains(QT_CONFIG, opengl(es2)?) { SUBDIRS += windowcontainer } -!contains(QT_CONFIG, opengl(es1|es2)?): SUBDIRS -= windowcontainer +!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop mac:SUBDIRS += mac |