diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch b/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch deleted file mode 100644 index b2dbbfd7..00000000 --- a/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From c09e6ef0bf6a879455ffee496c716a0bc1787cdf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Sat, 12 Sep 2015 12:58:46 +0200 | ||
| 4 | Subject: [PATCH 10/10] qeglplatformscreen.cpp: reorder headers to fix build | ||
| 5 | with egl enabled | ||
| 6 | MIME-Version: 1.0 | ||
| 7 | Content-Type: text/plain; charset=UTF-8 | ||
| 8 | Content-Transfer-Encoding: 8bit | ||
| 9 | |||
| 10 | fixes: | ||
| 11 | In file included from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/X11/Xlib.h:44:0, | ||
| 12 | from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglvivante.h:244, | ||
| 13 | from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglplatform.h:38, | ||
| 14 | from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/egl.h:39, | ||
| 15 | from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen_p.h:52, | ||
| 16 | from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen.cpp:34: | ||
| 17 | ../../include/QtCore/../../../git/src/corelib/io/qurl.h:131:9: error: expected identifier before numeric constant | ||
| 18 | None = 0x0, | ||
| 19 | ^ | ||
| 20 | |||
| 21 | This patch has a very limited lifetime: In branch dev and 5.6 the patched file is gone. Therefore: | ||
| 22 | |||
| 23 | Upstream-Status: Pending | ||
| 24 | |||
| 25 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 26 | --- | ||
| 27 | src/platformsupport/eglconvenience/qeglplatformscreen.cpp | 4 ++-- | ||
| 28 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp | ||
| 31 | index 61f8cdd..ceec797 100644 | ||
| 32 | --- a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp | ||
| 33 | +++ b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp | ||
| 34 | @@ -31,10 +31,10 @@ | ||
| 35 | ** | ||
| 36 | ****************************************************************************/ | ||
| 37 | |||
| 38 | -#include "qeglplatformscreen_p.h" | ||
| 39 | -#include "qeglplatformwindow_p.h" | ||
| 40 | #include <QtGui/qwindow.h> | ||
| 41 | #include <qpa/qwindowsysteminterface.h> | ||
| 42 | +#include "qeglplatformscreen_p.h" | ||
| 43 | +#include "qeglplatformwindow_p.h" | ||
| 44 | #include <QtPlatformSupport/private/qopenglcompositor_p.h> | ||
| 45 | |||
| 46 | QT_BEGIN_NAMESPACE | ||
| 47 | -- | ||
| 48 | 2.5.3 | ||
| 49 | |||
