AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Remove references to QOpenGLContext::destroy()

Browse Source 
This function is private.

Task-number: QTBUG-35907
Change-Id: I370c0bfd8fda11c68ee76ee42967f117a81b381c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Sze Howe Koh 2015-01-18 20:34:48 +08:00
parent 890ae41d06
commit 0f5b970894
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/kernel/qopenglcontext.cpp
View File

@ -518,8 +518,9 @@ void QOpenGLContext::setScreen(QScreen *screen)
in addition. Therefore \a handle is variant containing a platform-specific in addition. Therefore \a handle is variant containing a platform-specific
value type. These classes can be found in the QtPlatformHeaders module. value type. These classes can be found in the QtPlatformHeaders module.
When create() is called with native handles set, the handles' ownership are When create() is called with native handles set, QOpenGLContext does not
not taken, meaning that \c destroy() will not destroy the native context. take ownership of the handles, so destroying the QOpenGLContext does not
destroy the native context.
\note Some frameworks track the current context and surfaces internally. \note Some frameworks track the current context and surfaces internally.
Making the adopted QOpenGLContext current via Qt will have no effect on such Making the adopted QOpenGLContext current via Qt will have no effect on such
@ -582,8 +583,8 @@ QVariant QOpenGLContext::nativeHandle() const
Returns \c true if the native context was successfully created and is ready to Returns \c true if the native context was successfully created and is ready to
be used with makeCurrent(), swapBuffers(), etc. be used with makeCurrent(), swapBuffers(), etc.
\note If the context is already created, this function will first call \note If the context already exists, this function destroys the existing
\c destroy(), and then create a new OpenGL context. context first, and then creates a new one.
\sa makeCurrent(), format() \sa makeCurrent(), format()
*/ */
@ -605,6 +606,8 @@ bool QOpenGLContext::create()
} }
/*! /*!
\internal
Destroy the underlying platform context associated with this context. Destroy the underlying platform context associated with this context.
If any other context is directly or indirectly sharing resources with this If any other context is directly or indirectly sharing resources with this
@ -658,8 +661,7 @@ void QOpenGLContext::destroy()
/*! /*!
Destroys the QOpenGLContext object. Destroys the QOpenGLContext object.
This implicitly calls \c destroy(), so if this is the current context for the If this is the current context for the thread, doneCurrent() is also called.
thread, doneCurrent() is also called.
*/ */
QOpenGLContext::~QOpenGLContext() QOpenGLContext::~QOpenGLContext()
{ {