diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-01 12:30:07 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-01 12:30:07 +1000 |
| commit | 814c9cc62e299cff662d4b39f54642454b09afbd (patch) | |
| tree | 1be23b2d37cde9e64281f70cd4e9f2cc9b183051 /src/plugins/glsleditor/glsleditor.cpp | |
| parent | c552e26b2d85d2c120742f831178274a1d642dd6 (diff) | |
| download | qt-creator-814c9cc62e299cff662d4b39f54642454b09afbd.tar.gz | |
Replace the "Qt" GLSL variant with "ES_100"
The Qt variant is almost exactly the same as GLSL/ES,
so there is little point having a separate variant code.
Diffstat (limited to 'src/plugins/glsleditor/glsleditor.cpp')
| -rw-r--r-- | src/plugins/glsleditor/glsleditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index cb21ccb6b8..5ff01d764d 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -405,7 +405,7 @@ int GLSLTextEditor::languageVariant() const if (isDesktop) variant |= Lexer::Variant_GLSL_120; else - variant |= Lexer::Variant_GLSL_Qt; + variant |= Lexer::Variant_GLSL_ES_100; if (isVertex) variant |= Lexer::Variant_VertexShader; if (isFragment) |