diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-07-22 20:33:19 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-08-03 20:37:02 +0000 |
| commit | da3bd879576eab8230f73dbfc4d4fad2bb5636a6 (patch) | |
| tree | 45d60d58045d004e716b0c2fcb5bbcac4694e76c | |
| parent | 78488e197d2962e706f69aae22ac7b0d7438a8ee (diff) | |
Fix build with ICC 17: problem parsing override keyword
So just use the typedef that QPlatformOpenGLContext defines for a
function pointer.
qwaylandglcontext.h(76): error: expected a ";"
Intel Issue ID: 6000161944
Change-Id: I149e0540c00745fe8119fffd1463ce5c4ffdeb4c
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h | 2 | ||||
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index d513eefa3..d528b2327 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -73,7 +73,7 @@ public: bool isSharing() const Q_DECL_OVERRIDE; bool isValid() const Q_DECL_OVERRIDE; - void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h index eff75f292..862ed928b 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h @@ -64,7 +64,7 @@ public: bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; void doneCurrent() Q_DECL_OVERRIDE; - void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; private: GLXContext m_context; |