diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 12:22:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 12:23:22 +0100 |
| commit | 709e40093e6081b18e0d3003e0a088e1a9b6f211 (patch) | |
| tree | 0f7c729c13b5a17f11ce176906f62ef43ea895a2 /src/plugins/platforms/xcb/gl_integrations | |
| parent | 62cd369594dc39e06e8c7ec2c761cfedf5d9c9ba (diff) | |
| parent | 34b14a8472f44f8517577756e033b92ebd4c5912 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ie709286a14b452dae7abb59830f584bb33f1ccf5
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h index 15e11e7d0c..7725855327 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h @@ -57,7 +57,7 @@ public: bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; void doneCurrent() Q_DECL_OVERRIDE; void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void (*getProcAddress(const QByteArray &procName)) () Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const QByteArray &procName) Q_DECL_OVERRIDE; QSurfaceFormat format() const Q_DECL_OVERRIDE; bool isSharing() const Q_DECL_OVERRIDE; |