diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/gui/kernel/qopenglcontext.h | |
parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/gui/kernel/qopenglcontext.h')
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index 2dc4357b00..b9a47a54b8 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -96,7 +96,7 @@ class Q_GUI_EXPORT QOpenGLContext : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QOpenGLContext) public: - QOpenGLContext(QObject *parent = 0); + explicit QOpenGLContext(QObject *parent = 0); ~QOpenGLContext(); void setFormat(const QSurfaceFormat &format); @@ -117,7 +117,7 @@ public: void doneCurrent(); void swapBuffers(QSurface *surface); - QFunctionPointer getProcAddress(const QByteArray &procName); + QFunctionPointer getProcAddress(const QByteArray &procName) const; QSurface *surface() const; |