diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | 67 |
1 files changed, 54 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 08629f5c..042d7638 100644 --- a/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,19 +1,60 @@ | |||
1 | From ce38ab8b2167b74fa90eb3e17507dc9e799a3274 Mon Sep 17 00:00:00 2001 | 1 | From 4a067c162d08596e3ec89dcfb3ecdf197b1bf22a Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
4 | Subject: [PATCH 06/13] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" |
5 | |||
6 | With this change the build is failing with: | ||
7 | | In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0, | ||
8 | | from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/egl.h:36, | ||
9 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext_p.h:51, | ||
10 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:34: | ||
11 | | ../../include/QtCore/../../../git/src/corelib/io/qtextstream.h:72:10: error: expected identifier before 'int' | ||
12 | | enum Status { | ||
13 | | ^ | ||
14 | | In file included from ../../include/QtCore/qtextstream.h:1:0, | ||
15 | | from ../../include/QtCore/../../../git/src/corelib/io/qdebug.h:42, | ||
16 | | from ../../include/QtCore/qdebug.h:1, | ||
17 | | from ../../include/QtCore/QDebug:1, | ||
18 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:40: | ||
19 | | ../../include/QtCore/../../../git/src/corelib/io/qtextstream.h:72:17: error: expected unqualified-id before '{' token | ||
20 | | enum Status { | ||
21 | | ^ | ||
22 | | Makefile:3896: recipe for target '.obj/qeglplatformcontext.o' failed | ||
23 | | make[2]: *** [.obj/qeglplatformcontext.o] Error 1 | ||
24 | | make[2]: *** Waiting for unfinished jobs.... | ||
25 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:196:5: error: 'Display' redeclared as different kind of symbol | ||
26 | | Display | ||
27 | | ^ | ||
28 | | In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0, | ||
29 | | from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/egl.h:36, | ||
30 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration_p.h:51, | ||
31 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:55: | ||
32 | | /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/X11/Xlib.h:499:26: note: previous declaration 'typedef struct _XDisplay Display' | ||
33 | | typedef struct _XDisplay Display; | ||
34 | | ^ | ||
35 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp: In member function 'virtual void* QEGLPlatformIntegration::nativeResourceForScreen(const QByteArray&, QScreen*)': | ||
36 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:239:17: error: expected primary-expression before ':' token | ||
37 | | case Display: | ||
38 | | ^ | ||
39 | | Makefile:5486: recipe for target '.obj/qeglplatformintegration.o' failed | ||
5 | 40 | ||
6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | 41 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. |
42 | |||
43 | Will be partially resolved in newer revision with: | ||
44 | https://codereview.qt-project.org/96220 | ||
45 | |||
46 | Change-Id: I7a6a926b7525d4f137824c71f2ec8cd089c21f13 | ||
47 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | 48 | --- |
8 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- | 49 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- |
9 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- | 50 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- |
10 | 2 files changed, 3 insertions(+), 8 deletions(-) | 51 | 2 files changed, 3 insertions(+), 8 deletions(-) |
11 | 52 | ||
12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 53 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
13 | index 5eed470..39c7c1f 100644 | 54 | index c1a491c..7a0fc87 100644 |
14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | 55 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp |
15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 56 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
16 | @@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | 57 | @@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) |
17 | for (index = 0; attrs[index].attr != -1; ++index) { | 58 | for (index = 0; attrs[index].attr != -1; ++index) { |
18 | EGLint value; | 59 | EGLint value; |
19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | 60 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { |
@@ -25,20 +66,20 @@ index 5eed470..39c7c1f 100644 | |||
25 | + qWarning("\n"); | 66 | + qWarning("\n"); |
26 | } | 67 | } |
27 | 68 | ||
28 | #ifdef Q_OS_LINUX | 69 | #ifdef Q_OS_UNIX |
29 | diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 70 | diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp |
30 | index eec6463..4a7c69b 100644 | 71 | index 7cc3300..ccbd974 100644 |
31 | --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 72 | --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp |
32 | +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 73 | +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp |
33 | @@ -44,7 +44,6 @@ | 74 | @@ -37,7 +37,6 @@ |
34 | #include "qeglpbuffer_p.h" | ||
35 | #include <qpa/qplatformwindow.h> | 75 | #include <qpa/qplatformwindow.h> |
36 | #include <QOpenGLContext> | 76 | #include <QOpenGLContext> |
77 | #include <QtPlatformHeaders/QEGLNativeContext> | ||
37 | -#include <QDebug> | 78 | -#include <QDebug> |
38 | 79 | ||
39 | QT_BEGIN_NAMESPACE | 80 | QT_BEGIN_NAMESPACE |
40 | 81 | ||
41 | @@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont | 82 | @@ -181,12 +180,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont |
42 | return; | 83 | return; |
43 | } | 84 | } |
44 | 85 | ||
@@ -48,9 +89,9 @@ index eec6463..4a7c69b 100644 | |||
48 | - q_printEglConfig(m_eglDisplay, m_eglConfig); | 89 | - q_printEglConfig(m_eglDisplay, m_eglConfig); |
49 | - } | 90 | - } |
50 | - | 91 | - |
51 | #ifndef QT_NO_OPENGL | 92 | updateFormatFromGL(); |
52 | // Make the context current to ensure the GL version query works. This needs a surface too. | 93 | } |
53 | const EGLint pbufferAttributes[] = { | 94 | |
54 | -- | 95 | -- |
55 | 2.1.1 | 96 | 2.1.3 |
56 | 97 | ||