From da3bd879576eab8230f73dbfc4d4fad2bb5636a6 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 22 Jul 2016 20:33:19 -0700
Subject: [PATCH] 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>
---
src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h | 2 +-
.../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 d513eefa..d528b232 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 eff75f29..862ed928 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;
--
GitLab