diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-08-08 09:51:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-09 09:05:57 +0200 |
| commit | 31f2b7e5911f730245cf347924d1c839fc2832a4 (patch) | |
| tree | 0ea3dad41332c66697eb63bff87a28071b11c4d5 | |
| parent | 28bb18c0c08bdf6015a0e71de241d315e53fe940 (diff) | |
Use NAmE spelling of grey (gray)
These occurrences are only in docs or code comments.
Change-Id: Ia114466a85c01e2b978396c329153044921fb20b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/gui/kernel/qpixelformat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qpixelformat.cpp b/src/gui/kernel/qpixelformat.cpp index 441707791f..90ab2db93e 100644 --- a/src/gui/kernel/qpixelformat.cpp +++ b/src/gui/kernel/qpixelformat.cpp @@ -283,7 +283,7 @@ QT_BEGIN_NAMESPACE Constructor function for creating a Grayscale format. Monochrome formats can be described by passing 1 to \a channelSize. Its also possible to define very - accurate greyscale formats using doubles to describe each pixel by passing 8 + accurate grayscale formats using doubles to describe each pixel by passing 8 as \a channelSize and FloatingPoint as \a typeInterpretation. \sa QPixelFormat::TypeInterpretation diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index d0590ca521..d82abd73dc 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1823,7 +1823,7 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly if (prepareForCachedGlyphDraw(*cache)) shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT); } else { - // Greyscale/mono glyphs + // Grayscale/mono glyphs shaderManager->setMaskType(QOpenGLEngineShaderManager::PixelMask); prepareForCachedGlyphDraw(*cache); diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 5045d4a2ae..06857a9bb1 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1862,7 +1862,7 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFo } compositionModeDirty = true; } else { - // Greyscale/mono glyphs + // Grayscale/mono glyphs shaderManager->setMaskType(QGLEngineShaderManager::PixelMask); prepareForCachedGlyphDraw(*cache); |