From eca1933bb7e91ddda488a20e377625c226573e54 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 9 Feb 2017 12:07:18 +0100 Subject: [PATCH] Fix compilation on iOS The function is only used from inside the #ifndef ES2 blocks, causing it to fail compilation with a default configuration on iOS (where warnings are errors). Change-Id: I4f76c6371bd9125c7d1c919685df4a870eeb62f0 Reviewed-by: Paolo Angelelli --- src/gui/opengl/qopenglshaderprogram.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index c9552fd321e..cc8af16bfe7 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -215,10 +215,12 @@ Q_LOGGING_CATEGORY(DBG_SHADER_CACHE, "qt.opengl.diskcache") #define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE #endif +#ifndef QT_OPENGL_ES_2 static inline bool isFormatGLES(const QSurfaceFormat &f) { return (f.renderableType() == QSurfaceFormat::OpenGLES); } +#endif static inline bool supportsGeometry(const QSurfaceFormat &f) {