diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-02 12:45:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-02 17:36:45 +0200 |
| commit | bdcd86c03e1b5c66dec21746d4d3596eb556b77b (patch) | |
| tree | 5d9d24c69a704e5c67ac620ce1c04d2373df0728 /src/gui/opengl/qopenglengineshadermanager.cpp | |
| parent | da888ba53904af75c462af9f753191f25840e51f (diff) | |
| parent | ccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/gui/opengl/qopenglengineshadermanager.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglengineshadermanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp index a1215acb7e..1c4231b79f 100644 --- a/src/gui/opengl/qopenglengineshadermanager.cpp +++ b/src/gui/opengl/qopenglengineshadermanager.cpp @@ -164,7 +164,7 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context) code[NonPremultipliedImageSrcFragmentShader] = qopenglslNonPremultipliedImageSrcFragmentShader; code[CustomImageSrcFragmentShader] = qopenglslCustomSrcFragmentShader; // Calls "customShader", which must be appended code[SolidBrushSrcFragmentShader] = qopenglslSolidBrushSrcFragmentShader; - if (context->isES()) + if (context->isOpenGLES()) code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader_ES; else code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader_desktop; |