From 2544cfe80f4fca9d34c02336f051cfc215506cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 14 May 2019 20:15:48 +0200 Subject: Move forward-declaration inside of namespace Including both qopenglextensions.h and qopenglcontext.h would cause ambiguity for the compiler when using QOpenGLContext Change-Id: If8e46741c86d7639f442b5ac05a4493da784eb2f Reviewed-by: Laszlo Agocs --- src/openglextensions/qopenglextensions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/openglextensions') diff --git a/src/openglextensions/qopenglextensions.h b/src/openglextensions/qopenglextensions.h index 59dbdd4f12..439e0e6530 100644 --- a/src/openglextensions/qopenglextensions.h +++ b/src/openglextensions/qopenglextensions.h @@ -66,10 +66,10 @@ #include -class QOpenGLContext; - QT_BEGIN_NAMESPACE +class QOpenGLContext; + #if 0 // silence syncqt warnings #pragma qt_class(QOpenGLExtensions) -- cgit v1.2.3