1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with QT_NO_GRAPHICSEFFECT

Browse Source 
Change-Id: Iadc78c270f541067dbbebcf77748077cc3a8be13
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sérgio Martins 2014-02-08 00:11:56 +00:00 committed by The Qt Project
parent 4d6cb199b8
commit 8f899cd198
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opengl/qgraphicsshadereffect.cpp
View File

@ -40,6 +40,9 @@
****************************************************************************/ ****************************************************************************/
#include "qgraphicsshadereffect_p.h" #include "qgraphicsshadereffect_p.h"
#ifndef QT_NO_GRAPHICSEFFECT
#include "qglshaderprogram.h" #include "qglshaderprogram.h"
#include "gl2paintengineex/qglcustomshaderstage_p.h" #include "gl2paintengineex/qglcustomshaderstage_p.h"
#define QGL_HAVE_CUSTOM_SHADERS 1 #define QGL_HAVE_CUSTOM_SHADERS 1
@ -311,3 +314,5 @@ void QGraphicsShaderEffect::setUniforms(QGLShaderProgram *program)
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_GRAPHICSEFFECT

5
src/opengl/qgraphicsshadereffect_p.h
View File

@ -54,6 +54,9 @@
// //
#include <QtWidgets/qgraphicseffect.h> #include <QtWidgets/qgraphicseffect.h>
#ifndef QT_NO_GRAPHICSEFFECT
#include <QtOpenGL/qtopenglglobal.h> #include <QtOpenGL/qtopenglglobal.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -87,4 +90,6 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_GRAPHICSEFFECT
#endif // QGRAPHICSSHADEREFFECT_P_H #endif // QGRAPHICSSHADEREFFECT_P_H