diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:30 +0100 |
| commit | 11b9c813e6705b0349e4c241f9132a6649977431 (patch) | |
| tree | 69df65cb06c9617ab305a55be413a6be63677913 /src/gui | |
| parent | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (diff) | |
| parent | 4554fa7b191566df0a6c07e686c642c78eb88095 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ief0a0b754c104d5348fee9ee15e967bd37c526f8
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qicon.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 6a4fc8927a..8870950982 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE class QIconPrivate; class QIconEngine; +class QPainter; class Q_GUI_EXPORT QIcon { diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index acb6c3fe94..bf3403f2e4 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -313,7 +313,7 @@ QOpenGLContext *qt_gl_global_share_context() \section1 Context Resource Sharing - Resources, such as framebuffer objects, textures, and vertex buffer objects + Resources such as textures and vertex buffer objects can be shared between contexts. Use setShareContext() before calling create() to specify that the contexts should share these resources. QOpenGLContext internally keeps track of a QOpenGLContextGroup object which diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index f25988585e..1e4d627e2a 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -4348,7 +4348,7 @@ QOpenGLTexture::DepthStencilMode QOpenGLTexture::depthStencilMode() const */ -/* +/*! \since 5.5 Sets the texture comparison function on this texture to \a function. The texture diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 66af6e3de3..afa540380f 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3407,7 +3407,7 @@ bool QRasterPaintEngine::requiresPretransformedGlyphPositions(QFontEngine *fontE } /*! - Indicates whether glyph caching is supported by the font engine + Returns whether glyph caching is supported by the font engine \a fontEngine with the given transform \a m applied. */ bool QRasterPaintEngine::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const |