diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:03 +0100 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:11 +0100 |
commit | 27016b89ae49da091527548af0ca9022ec4d7902 (patch) | |
tree | de408d49d52dd6a73e75a612ef51342d6ee44638 /examples/opengl/opengl.pro | |
parent | 3683bc97d2ebc0de3272fc09656b90a88f5eb326 (diff) | |
parent | fbaa6d3ca6fc2693c5c8a1cd8e565803adc97730 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idec54e19963e8d88c711cb179cffc81596323899
Diffstat (limited to 'examples/opengl/opengl.pro')
-rw-r--r-- | examples/opengl/opengl.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 54b0321b26..bcf62b6551 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -14,7 +14,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ } } else { SUBDIRS = 2dpainting \ - cube \ grabber \ hellogl \ overpainting \ @@ -25,6 +24,8 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ } SUBDIRS += hellowindow \ - paintedwindow + paintedwindow \ + contextinfo \ + cube EXAMPLE_FILES = shared |