diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /examples/opengl | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/opengl.pro | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index ef44201494..89b3e1d86e 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -8,14 +8,12 @@ qtHaveModule(widgets) { SUBDIRS += contextinfo \ threadedqopenglwidget \ 2dpainting \ - hellogl2 - - !wince: SUBDIRS += \ - qopenglwidget \ - cube \ - textures \ - hellogles3 \ - computegles31 + hellogl2 \ + qopenglwidget \ + cube \ + textures \ + hellogles3 \ + computegles31 } EXAMPLE_FILES += \ |