diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch | 196 |
1 files changed, 196 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch new file mode 100644 index 00000000..1fa4aca4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch @@ -0,0 +1,196 @@ +From 2cece4539990f9e7b0239681bd2fc2808aeb8dbc Mon Sep 17 00:00:00 2001 +From: Stephan Binner <stephan.binner@basyskom.com> +Date: Mon, 2 Feb 2015 13:10:50 +0100 +Subject: [PATCH 13/13] Fix build of egl integration + +Add missing includes and reorder includes to avoid X defines breakage + +Upstream-Status: Backport from 5.4 branch https://codereview.qt-project.org/#/c/105116/ + +Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9 +Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> +Signed-off-by: Stephan Binner <stephan.binner@basyskom.com> +--- + .../eglconvenience/qeglplatformcontext_p.h | 1 + + .../eglconvenience/qeglplatformintegration_p.h | 2 +- + src/plugins/platforms/eglfs/qeglfscontext.cpp | 13 +++++++------ + src/plugins/platforms/eglfs/qeglfshooks_stub.cpp | 2 +- + src/plugins/platforms/eglfs/qeglfsintegration.cpp | 20 ++++++++++---------- + src/plugins/platforms/eglfs/qeglfsscreen.cpp | 4 +++- + src/plugins/platforms/eglfs/qeglfswindow.cpp | 6 ++++-- + .../platforms/minimalegl/qminimaleglwindow.cpp | 4 ++-- + 8 files changed, 29 insertions(+), 23 deletions(-) + +diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +index 7825c7b..0c10710 100644 +--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h ++++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +@@ -45,6 +45,7 @@ + // We mean it. + // + ++#include <QtCore/qtextstream.h> + #include <qpa/qplatformwindow.h> + #include <qpa/qplatformopenglcontext.h> + #include <QtCore/QVariant> +diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h +index c9b6873..a0aab03 100644 +--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h ++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h +@@ -45,9 +45,9 @@ + // We mean it. + // + ++#include <QtCore/QVariant> + #include <qpa/qplatformintegration.h> + #include <qpa/qplatformnativeinterface.h> +-#include <QtCore/QVariant> + #include <EGL/egl.h> + + // Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ +diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp +index 6216fa8..6470280 100644 +--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp ++++ b/src/plugins/platforms/eglfs/qeglfscontext.cpp +@@ -31,15 +31,16 @@ + ** + ****************************************************************************/ + +-#include "qeglfscontext.h" +-#include "qeglfswindow.h" +-#include "qeglfshooks.h" ++#include <QtGui/QSurface> ++#include <QtDebug> + ++#include <QtPlatformSupport/private/qeglplatformcursor_p.h> + #include <QtPlatformSupport/private/qeglconvenience_p.h> + #include <QtPlatformSupport/private/qeglpbuffer_p.h> +-#include <QtPlatformSupport/private/qeglplatformcursor_p.h> +-#include <QtGui/QSurface> +-#include <QtDebug> ++ ++#include "qeglfswindow.h" ++#include "qeglfshooks.h" ++#include "qeglfscontext.h" + + QT_BEGIN_NAMESPACE + +diff --git a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp +index 26d77a2..120c603 100644 +--- a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp ++++ b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp +@@ -31,10 +31,10 @@ + ** + ****************************************************************************/ + +-#include "qeglfshooks.h" + #include <QtPlatformSupport/private/qeglplatformcursor_p.h> + #include <QtPlatformSupport/private/qeglconvenience_p.h> + #include <QtCore/QRegularExpression> ++#include "qeglfshooks.h" + + #if defined(Q_OS_LINUX) + #include <fcntl.h> +diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp +index 2a4eae3..fbdd1d4 100644 +--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp ++++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp +@@ -31,26 +31,26 @@ + ** + ****************************************************************************/ + +-#include "qeglfsintegration.h" ++#include <QtCore/qtextstream.h> ++#include <QtGui/private/qguiapplication_p.h> ++ ++#include <qpa/qplatformwindow.h> ++#include <QtGui/QSurfaceFormat> ++#include <QtGui/QOpenGLContext> ++#include <QtGui/QScreen> ++#include <QtGui/QOffscreenSurface> ++#include <qpa/qplatformcursor.h> + ++#include "qeglfsintegration.h" + #include "qeglfswindow.h" + #include "qeglfshooks.h" + #include "qeglfscontext.h" + +-#include <QtGui/private/qguiapplication_p.h> +- + #include <QtPlatformSupport/private/qeglconvenience_p.h> + #include <QtPlatformSupport/private/qeglplatformcontext_p.h> + #include <QtPlatformSupport/private/qeglpbuffer_p.h> + #include <QtPlatformHeaders/QEGLNativeContext> + +-#include <qpa/qplatformwindow.h> +-#include <QtGui/QSurfaceFormat> +-#include <QtGui/QOpenGLContext> +-#include <QtGui/QScreen> +-#include <QtGui/QOffscreenSurface> +-#include <qpa/qplatformcursor.h> +- + #include <EGL/egl.h> + + static void initResources() +diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp +index cd68540..bc93fe2 100644 +--- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp ++++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp +@@ -31,10 +31,12 @@ + ** + ****************************************************************************/ + ++#include <QtCore/qtextstream.h> ++#include <QtPlatformSupport/private/qeglplatformcursor_p.h> ++ + #include "qeglfsscreen.h" + #include "qeglfswindow.h" + #include "qeglfshooks.h" +-#include <QtPlatformSupport/private/qeglplatformcursor_p.h> + + QT_BEGIN_NAMESPACE + +diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp +index 5ebde6d..2c05979 100644 +--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp ++++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp +@@ -31,8 +31,7 @@ + ** + ****************************************************************************/ + +-#include "qeglfswindow.h" +-#include "qeglfshooks.h" ++#include <QtCore/qtextstream.h> + #include <qpa/qwindowsysteminterface.h> + #include <qpa/qplatformintegration.h> + #include <private/qguiapplication_p.h> +@@ -40,6 +39,9 @@ + #include <QtPlatformSupport/private/qeglplatformcursor_p.h> + #include <QtPlatformSupport/private/qeglconvenience_p.h> + ++#include "qeglfswindow.h" ++#include "qeglfshooks.h" ++ + #include <QtDebug> + + QT_BEGIN_NAMESPACE +diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp +index 906a130..d4bee2c 100644 +--- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp ++++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp +@@ -31,10 +31,10 @@ + ** + ****************************************************************************/ + +-#include "qminimaleglwindow.h" +- + #include <qpa/qwindowsysteminterface.h> + ++#include "qminimaleglwindow.h" ++ + QT_BEGIN_NAMESPACE + + QMinimalEglWindow::QMinimalEglWindow(QWindow *w) +-- +2.3.1 + |