diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
commit | 0aa2d318b1524cdab42ab9988270779ddcc1922a (patch) | |
tree | 695c70702763ba2c66eb398ae9d545fc712a9e2d /examples/opengl | |
parent | 6251d4dafc86bcbec09d1962050af9924249d419 (diff) | |
parent | 49049d90470eb3e94bda77d19ab7f7c57a0bd57f (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qsysinfo.h
src/corelib/global/qsystemdetection.h
src/corelib/kernel/qobjectdefs.h
src/plugins/plugins.pro
tests/auto/widgets/itemviews/qlistview/qlistview.pro
Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/opengl.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 7c055d2a82..cf5329c55d 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -10,7 +10,8 @@ qtHaveModule(widgets) { 2dpainting \ hellogl2 - !wince*: SUBDIRS += qopenglwidget \ - cube \ - textures + !wince: SUBDIRS += \ + qopenglwidget \ + cube \ + textures } |