diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/opengl/opengl.pro | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 718a8868099..016db46405c 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -33,7 +33,6 @@ SOURCES += qgl.cpp \ qglbuffer.cpp \ HEADERS += qglshaderprogram.h \ - qgraphicsshadereffect_p.h \ gl2paintengineex/qglgradientcache_p.h \ gl2paintengineex/qglengineshadermanager_p.h \ gl2paintengineex/qgl2pexvertexarray_p.h \ @@ -44,7 +43,6 @@ HEADERS += qglshaderprogram.h \ gl2paintengineex/qglshadercache_p.h SOURCES += qglshaderprogram.cpp \ - qgraphicsshadereffect.cpp \ gl2paintengineex/qglgradientcache.cpp \ gl2paintengineex/qglengineshadermanager.cpp \ gl2paintengineex/qgl2pexvertexarray.cpp \ @@ -52,4 +50,9 @@ SOURCES += qglshaderprogram.cpp \ gl2paintengineex/qglcustomshaderstage.cpp \ gl2paintengineex/qtextureglyphcache_gl.cpp +qtConfig(graphicseffect) { + HEADERS += qgraphicsshadereffect_p.h + SOURCES += qgraphicsshadereffect.cpp +} + load(qt_module) |