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

Use NAmE spelling of grey (gray)

Browse Source 
These occurrences are only in docs or code comments.

Change-Id: Ia114466a85c01e2b978396c329153044921fb20b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Marc Mutz 2014-08-08 09:51:34 +02:00 committed by Oswald Buddenhagen
parent 28bb18c0c0
commit 31f2b7e591
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qpixelformat.cpp
View File

@ -283,7 +283,7 @@ QT_BEGIN_NAMESPACE
Constructor function for creating a Grayscale format. Monochrome formats can be Constructor function for creating a Grayscale format. Monochrome formats can be
described by passing 1 to \a channelSize. Its also possible to define very 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. as \a channelSize and FloatingPoint as \a typeInterpretation.
\sa QPixelFormat::TypeInterpretation \sa QPixelFormat::TypeInterpretation

2
src/gui/opengl/qopenglpaintengine.cpp
View File

@ -1823,7 +1823,7 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly
if (prepareForCachedGlyphDraw(*cache)) if (prepareForCachedGlyphDraw(*cache))
shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT); shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
} else { } else {
// Greyscale/mono glyphs // Grayscale/mono glyphs
shaderManager->setMaskType(QOpenGLEngineShaderManager::PixelMask); shaderManager->setMaskType(QOpenGLEngineShaderManager::PixelMask);
prepareForCachedGlyphDraw(*cache); prepareForCachedGlyphDraw(*cache);

2
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
View File

@ -1862,7 +1862,7 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFo
} }
compositionModeDirty = true; compositionModeDirty = true;
} else { } else {
// Greyscale/mono glyphs // Grayscale/mono glyphs
shaderManager->setMaskType(QGLEngineShaderManager::PixelMask); shaderManager->setMaskType(QGLEngineShaderManager::PixelMask);
prepareForCachedGlyphDraw(*cache); prepareForCachedGlyphDraw(*cache);