Merge branch 'Plasma/5.12'

fixqopengl.h

@@ -0,0 +1,37 @@
+/********************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright (C) 2018 Bhushan Shah <bshah@kde.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+
+#ifndef FIXQOPENGL_H
+#define FIXQOPENGL_H
+
+// qopengl.h declares GLdouble as a typedef of float when Qt is built
+// with GLES support.  This conflicts with the epoxy/gl_generated.h
+// declaration, so we have to prevent the Qt header from being #included.
+#define QOPENGL_H
+
+#ifndef QOPENGLF_APIENTRY
+#define QOPENGLF_APIENTRY GLAPIENTRY
+#endif
+
+#ifndef QOPENGLF_APIENTRYP
+#define QOPENGLF_APIENTRYP GLAPIENTRYP
+#endif
+
+#endif //FIXQOPENGL_H

libkwineffects/kwinglplatform.cpp

@@ -19,6 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "kwinglplatform.h"
+// include kwinglutils_funcs.h to avoid the redeclaration issues
+// between qopengl.h and epoxy/gl.h
+#include "kwinglutils_funcs.h"
 #include <epoxy/gl.h>
 
 #include <QRegExp>

platform.h

@@ -22,6 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwin_export.h>
 #include <kwinglobals.h>
 #include <epoxy/egl.h>
+#include "fixqopengl.h"
+
 #include <fixx11h.h>
 #include <QImage>
 #include <QObject>

plugins/qpa/abstractplatformcontext.h

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_QPA_ABSTRACTPLATFORMCONTEXT_H
 
 #include <epoxy/egl.h>
+#include "fixqopengl.h"
 #include <fixx11h.h>
 #include <qpa/qplatformopenglcontext.h>
 

plugins/qpa/integration.h

@@ -21,6 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_QPA_INTEGRATION_H
 
 #include <epoxy/egl.h>
+#include "fixqopengl.h"
+
 #include <fixx11h.h>
 #include <qpa/qplatformintegration.h>
 #include <QObject>

plugins/qpa/window.h

@@ -21,6 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_QPA_WINDOW_H
 
 #include <epoxy/egl.h>
+#include "fixqopengl.h"
+
 #include <fixx11h.h>
 #include <qpa/qplatformwindow.h>
 // wayland