* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
@ 2015-09-03 13:22 Marc Andre
2015-09-04 13:39 ` Vicente Olivert Riera
2015-10-17 18:17 ` Thomas Petazzoni
0 siblings, 2 replies; 7+ messages in thread
From: Marc Andre @ 2015-09-03 13:22 UTC (permalink / raw)
To: buildroot
Update the already existing fix for EGL/X11 header issue to fix
an additional problem encountered on my system where I had
compile errors in qeglplatformscreen.cpp. The problem was related
to the wrong order of includes. The X11 headers must always be
included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html
I decided instead of adding a new patch to update the existing patch,
because it is an additional fix for the same problem. If you don't agree
I am happy to submit a seperate patch.
This version is updated as suggested by Arnout.
Signed-off-by: Marc Andre <marc.andre@netline.ch>
---
package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
index 53f8453..0777c44 100644
--- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
+++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
@@ -1,11 +1,17 @@
-The vivante headers pull in X11 defines which break eglconvenience
+Some EGL headers pull in X11 defines which break eglconvenience
* Adds a missing include to qeglplatformcontext.cpp
* Fix namespace collision on CursorShape, pulled in from X11/X.h
* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
+* Reorder includes to have the X11-header the last include
+
+Based on patch from Yocto project and buildroot patch from
+Jerome Pouiller <jezz@sysmic.org>
+Updated to fix issue in qeglplatformscreen (reorder includes, see also
+http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
-[based on patch from Yocto project]
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
+Signed-off-by: Marc Andre <marc.andre@netline.ch>
diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
@@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
#include "qeglplatformscreen_p.h"
QT_BEGIN_NAMESPACE
+--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
+@@ -31,11 +31,11 @@
+ **
+ ****************************************************************************/
+
+-#include "qeglplatformscreen_p.h"
+-#include "qeglplatformwindow_p.h"
+ #include <QtGui/qwindow.h>
+ #include <qpa/qwindowsysteminterface.h>
+ #include <QtPlatformSupport/private/qopenglcompositor_p.h>
++#include "qeglplatformscreen_p.h"
++#include "qeglplatformwindow_p.h"
+
+ QT_BEGIN_NAMESPACE
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
2015-09-03 13:22 [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp Marc Andre
@ 2015-09-04 13:39 ` Vicente Olivert Riera
2015-09-04 15:24 ` Marc Andre
2015-09-04 16:30 ` Arnout Vandecappelle
2015-10-17 18:17 ` Thomas Petazzoni
1 sibling, 2 replies; 7+ messages in thread
From: Vicente Olivert Riera @ 2015-09-04 13:39 UTC (permalink / raw)
To: buildroot
Dear Marc Andre,
On 09/03/2015 02:22 PM, Marc Andre wrote:
> Update the already existing fix for EGL/X11 header issue to fix
> an additional problem encountered on my system where I had
> compile errors in qeglplatformscreen.cpp. The problem was related
> to the wrong order of includes. The X11 headers must always be
> included last, as indicated in
> http://lists.qt-project.org/pipermail/development/2013-March/010511.html
I have seen that message in the mailing list and Thiago says:
"Please reorder the includes in that file. The X11 includes must
*always* be the last include in the .cpp. If you can, submit that fix to
codereview.qt-project.org."
Have you submitted that fix to codereview.qt-project.org? It would be
good to fix it upstream.
> I decided instead of adding a new patch to update the existing patch,
> because it is an additional fix for the same problem. If you don't agree
> I am happy to submit a seperate patch.
>
> This version is updated as suggested by Arnout.
>
> Signed-off-by: Marc Andre <marc.andre@netline.ch>
> ---
> package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> index 53f8453..0777c44 100644
> --- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> +++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> @@ -1,11 +1,17 @@
> -The vivante headers pull in X11 defines which break eglconvenience
> +Some EGL headers pull in X11 defines which break eglconvenience
>
> * Adds a missing include to qeglplatformcontext.cpp
> * Fix namespace collision on CursorShape, pulled in from X11/X.h
> * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
> +* Reorder includes to have the X11-header the last include
> +
> +Based on patch from Yocto project and buildroot patch from
> +Jerome Pouiller <jezz@sysmic.org>
> +Updated to fix issue in qeglplatformscreen (reorder includes, see also
> +http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
>
> -[based on patch from Yocto project]
I'm not sure if this is correct. Yes, you are modifying the patch and
adding new stuff, but the rest is still based on Yocto Project's patch.
I think it should stay, or at least say something like:
[part of it based on patch from Yocto project]
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> +Signed-off-by: Marc Andre <marc.andre@netline.ch>
>
>
> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
> @@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
> #include "qeglplatformscreen_p.h"
>
> QT_BEGIN_NAMESPACE
> +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
> ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
> +@@ -31,11 +31,11 @@
> + **
> + ****************************************************************************/
> +
> +-#include "qeglplatformscreen_p.h"
> +-#include "qeglplatformwindow_p.h"
> + #include <QtGui/qwindow.h>
> + #include <qpa/qwindowsysteminterface.h>
> + #include <QtPlatformSupport/private/qopenglcompositor_p.h>
> ++#include "qeglplatformscreen_p.h"
> ++#include "qeglplatformwindow_p.h"
> +
> + QT_BEGIN_NAMESPACE
>
>
Regards,
Vincent.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
2015-09-04 13:39 ` Vicente Olivert Riera
@ 2015-09-04 15:24 ` Marc Andre
2015-09-04 16:30 ` Arnout Vandecappelle
1 sibling, 0 replies; 7+ messages in thread
From: Marc Andre @ 2015-09-04 15:24 UTC (permalink / raw)
To: buildroot
Hi Vincente
On 04.09.2015 15:39, Vicente Olivert Riera wrote:
> Dear Marc Andre,
>
> On 09/03/2015 02:22 PM, Marc Andre wrote:
>> Update the already existing fix for EGL/X11 header issue to fix
>> an additional problem encountered on my system where I had
>> compile errors in qeglplatformscreen.cpp. The problem was related
>> to the wrong order of includes. The X11 headers must always be
>> included last, as indicated in
>> http://lists.qt-project.org/pipermail/development/2013-March/010511.html
> I have seen that message in the mailing list and Thiago says:
>
> "Please reorder the includes in that file. The X11 includes must
> *always* be the last include in the .cpp. If you can, submit that fix to
> codereview.qt-project.org."
>
> Have you submitted that fix to codereview.qt-project.org? It would be
> good to fix it upstream.
I did consider it, but as long as the the other part of the
0003-xcb-egl-fixes.patch isn't fixed in the upstream project fixing this
doesn't make too much sense. I will certainly submit, but I would
appreciate to fix it in buildroot until qt5 is fixed.
I will submit the full 0003-xcb-egl-fixes.patch to qt.
>> I decided instead of adding a new patch to update the existing patch,
>> because it is an additional fix for the same problem. If you don't agree
>> I am happy to submit a seperate patch.
>>
>> This version is updated as suggested by Arnout.
>>
>> Signed-off-by: Marc Andre <marc.andre@netline.ch>
>> ---
>> package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++--
>> 1 file changed, 23 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> index 53f8453..0777c44 100644
>> --- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> +++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> @@ -1,11 +1,17 @@
>> -The vivante headers pull in X11 defines which break eglconvenience
>> +Some EGL headers pull in X11 defines which break eglconvenience
>>
>> * Adds a missing include to qeglplatformcontext.cpp
>> * Fix namespace collision on CursorShape, pulled in from X11/X.h
>> * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
>> +* Reorder includes to have the X11-header the last include
>> +
>> +Based on patch from Yocto project and buildroot patch from
>> +Jerome Pouiller <jezz@sysmic.org>
>> +Updated to fix issue in qeglplatformscreen (reorder includes, see also
>> +http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
>>
>> -[based on patch from Yocto project]
> I'm not sure if this is correct. Yes, you are modifying the patch and
> adding new stuff, but the rest is still based on Yocto Project's patch.
> I think it should stay, or at least say something like:
>
> [part of it based on patch from Yocto project]
It is in, see 3 lines higher: "Based on patch from Yocto project and
builroot patch from Jerome"
>
>> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
>> +Signed-off-by: Marc Andre <marc.andre@netline.ch>
>>
>>
>> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
>> @@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
>> #include "qeglplatformscreen_p.h"
>>
>> QT_BEGIN_NAMESPACE
>> +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
>> ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
>> +@@ -31,11 +31,11 @@
>> + **
>> + ****************************************************************************/
>> +
>> +-#include "qeglplatformscreen_p.h"
>> +-#include "qeglplatformwindow_p.h"
>> + #include <QtGui/qwindow.h>
>> + #include <qpa/qwindowsysteminterface.h>
>> + #include <QtPlatformSupport/private/qopenglcompositor_p.h>
>> ++#include "qeglplatformscreen_p.h"
>> ++#include "qeglplatformwindow_p.h"
>> +
>> + QT_BEGIN_NAMESPACE
>>
>>
> Regards,
>
> Vincent.
Regards,
Marc
--
Marc Andr?, Andr?-Netline
eBusiness-Solutions
Andr?-Netline
K?nizstr. 161
CH-3097 Liebefeld
Tel. 031 974 16 66
Fax: 031 974 16 65
marc.andre at netline.ch
http://www.netline.ch
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
2015-09-04 13:39 ` Vicente Olivert Riera
2015-09-04 15:24 ` Marc Andre
@ 2015-09-04 16:30 ` Arnout Vandecappelle
1 sibling, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2015-09-04 16:30 UTC (permalink / raw)
To: buildroot
On 04-09-15 15:39, Vicente Olivert Riera wrote:
> Dear Marc Andre,
>
> On 09/03/2015 02:22 PM, Marc Andre wrote:
[snip]
>> +Based on patch from Yocto project and buildroot patch from
>> +Jerome Pouiller <jezz@sysmic.org>
>> +Updated to fix issue in qeglplatformscreen (reorder includes, see also
>> +http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
>>
>> -[based on patch from Yocto project]
>
> I'm not sure if this is correct. Yes, you are modifying the patch and
> adding new stuff, but the rest is still based on Yocto Project's patch.
> I think it should stay, or at least say something like:
It is still there, a few lines up:
Based on patch from Yocto project and buildroot patch from
Jerome Pouiller <jezz@sysmic.org>
That said, I don't really like the way it's formulated either, I'd prefer to
keep the original and add something:
[based on patch from Yocto project]
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
+Updated to fix issue in qeglplatformscreen (reorder includes, see also
+http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
+Signed-off-by: Marc Andre <marc.andre@netline.ch>
But really, it's not that important, so:
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
>
> [part of it based on patch from Yocto project]
>
>> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
>> +Signed-off-by: Marc Andre <marc.andre@netline.ch>
>>
>>
>> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
>> @@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
>> #include "qeglplatformscreen_p.h"
>>
>> QT_BEGIN_NAMESPACE
>> +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
>> ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
>> +@@ -31,11 +31,11 @@
>> + **
>> + ****************************************************************************/
>> +
>> +-#include "qeglplatformscreen_p.h"
>> +-#include "qeglplatformwindow_p.h"
>> + #include <QtGui/qwindow.h>
>> + #include <qpa/qwindowsysteminterface.h>
>> + #include <QtPlatformSupport/private/qopenglcompositor_p.h>
>> ++#include "qeglplatformscreen_p.h"
>> ++#include "qeglplatformwindow_p.h"
>> +
>> + QT_BEGIN_NAMESPACE
>>
>>
>
> Regards,
>
> Vincent.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
2015-09-03 13:22 [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp Marc Andre
2015-09-04 13:39 ` Vicente Olivert Riera
@ 2015-10-17 18:17 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2015-10-17 18:17 UTC (permalink / raw)
To: buildroot
Dear Marc Andre,
On Thu, 3 Sep 2015 15:22:10 +0200, Marc Andre wrote:
> Update the already existing fix for EGL/X11 header issue to fix
> an additional problem encountered on my system where I had
> compile errors in qeglplatformscreen.cpp. The problem was related
> to the wrong order of includes. The X11 headers must always be
> included last, as indicated in
> http://lists.qt-project.org/pipermail/development/2013-March/010511.html
>
> I decided instead of adding a new patch to update the existing patch,
> because it is an additional fix for the same problem. If you don't agree
> I am happy to submit a seperate patch.
>
> This version is updated as suggested by Arnout.
>
> Signed-off-by: Marc Andre <marc.andre@netline.ch>
> ---
> package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
Applied, after slightly tweaking the commit log (to avoid sentence at
the first person) and rework the SoB as suggested by Arnout.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
@ 2015-09-02 12:03 Marc
2015-09-02 22:00 ` Arnout Vandecappelle
0 siblings, 1 reply; 7+ messages in thread
From: Marc @ 2015-09-02 12:03 UTC (permalink / raw)
To: buildroot
Update the already existing fix for EGL/X11 header issue to fix
an additional problem encountered on my system where I had
compile errors in qeglplatformscreen.cpp. The problem was related
to the wrong order of includes. The X11 headers must always be
included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html
I decided instead of adding a new patch to update the existing patch,
because it is an additional fix for the same problem. If you don't agree
I am happy to submit a seperate patch.
Signed-off-by: Marc <marc.andre@netline.ch>
---
package/qt5/qt5base/0003-xcb-egl-fixes.patch | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
index 53f8453..56b4923 100644
--- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
+++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
@@ -1,11 +1,13 @@
-The vivante headers pull in X11 defines which break eglconvenience
+Some EGL headers pull in X11 defines which break eglconvenience
* Adds a missing include to qeglplatformcontext.cpp
* Fix namespace collision on CursorShape, pulled in from X11/X.h
* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
+* Reorder includes to have the X11-header the last include
-[based on patch from Yocto project]
-Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
+Based on patch from Yocto project and buildroot patch from J?r?me Pouiller <jezz@sysmic.org>
+Updated to fix issue in qeglplatformscreen (reorder includes, see also
+http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
@@ -61,4 +63,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
#include "qeglplatformscreen_p.h"
QT_BEGIN_NAMESPACE
+--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
+@@ -31,11 +31,11 @@
+ **
+ ****************************************************************************/
+
+-#include "qeglplatformscreen_p.h"
+-#include "qeglplatformwindow_p.h"
+ #include <QtGui/qwindow.h>
+ #include <qpa/qwindowsysteminterface.h>
+ #include <QtPlatformSupport/private/qopenglcompositor_p.h>
++#include "qeglplatformscreen_p.h"
++#include "qeglplatformwindow_p.h"
+
+ QT_BEGIN_NAMESPACE
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
2015-09-02 12:03 Marc
@ 2015-09-02 22:00 ` Arnout Vandecappelle
0 siblings, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2015-09-02 22:00 UTC (permalink / raw)
To: buildroot
Hi Marc,
On 02-09-15 14:03, Marc wrote:
> Update the already existing fix for EGL/X11 header issue to fix
> an additional problem encountered on my system where I had
> compile errors in qeglplatformscreen.cpp. The problem was related
> to the wrong order of includes. The X11 headers must always be
> included last, as indicated in
> http://lists.qt-project.org/pipermail/development/2013-March/010511.html
>
> I decided instead of adding a new patch to update the existing patch,
> because it is an additional fix for the same problem. If you don't agree
> I am happy to submit a seperate patch.
>
> Signed-off-by: Marc <marc.andre@netline.ch>
Please use your full (real) name in the Sob. It's a legal statement, where you
assert that you have the right to contribute this patch under the appropriate
license.
> ---
> package/qt5/qt5base/0003-xcb-egl-fixes.patch | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> index 53f8453..56b4923 100644
> --- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> +++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
> @@ -1,11 +1,13 @@
> -The vivante headers pull in X11 defines which break eglconvenience
> +Some EGL headers pull in X11 defines which break eglconvenience
>
> * Adds a missing include to qeglplatformcontext.cpp
> * Fix namespace collision on CursorShape, pulled in from X11/X.h
> * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
> +* Reorder includes to have the X11-header the last include
>
> -[based on patch from Yocto project]
> -Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> +Based on patch from Yocto project and buildroot patch from J?r?me Pouiller <jezz@sysmic.org>
> +Updated to fix issue in qeglplatformscreen (reorder includes, see also
> +http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
You should also add your Sob here, Also, since most of the original patch is
still maintained, you should not remove J?r?me's Sob.
Regards,
Arnout
>
>
> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
> @@ -61,4 +63,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
> #include "qeglplatformscreen_p.h"
>
> QT_BEGIN_NAMESPACE
> +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200
> ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200
> +@@ -31,11 +31,11 @@
> + **
> + ****************************************************************************/
> +
> +-#include "qeglplatformscreen_p.h"
> +-#include "qeglplatformwindow_p.h"
> + #include <QtGui/qwindow.h>
> + #include <qpa/qwindowsysteminterface.h>
> + #include <QtPlatformSupport/private/qopenglcompositor_p.h>
> ++#include "qeglplatformscreen_p.h"
> ++#include "qeglplatformwindow_p.h"
> +
> + QT_BEGIN_NAMESPACE
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-10-17 18:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-03 13:22 [Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp Marc Andre
2015-09-04 13:39 ` Vicente Olivert Riera
2015-09-04 15:24 ` Marc Andre
2015-09-04 16:30 ` Arnout Vandecappelle
2015-10-17 18:17 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2015-09-02 12:03 Marc
2015-09-02 22:00 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox