[1/1] package/qt5webkit-examples: fix build withqt5webkit
diff mbox series

Message ID 20190513202210.1706-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [1/1] package/qt5webkit-examples: fix build withqt5webkit
Related show

Commit Message

Fabrice Fontaine May 13, 2019, 8:22 p.m. UTC
Fixes:
 - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0002-Fix-QWebView-path.patch              | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch

Comments

Thomas Petazzoni May 13, 2019, 9:10 p.m. UTC | #1
Hello,

On Mon, 13 May 2019 22:22:10 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fixes:
>  - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Is this for both Qt latest and Qt LTS ?

Thanks!

Thomas
Fabrice Fontaine May 13, 2019, 9:18 p.m. UTC | #2
Dear Thomas,

Le lun. 13 mai 2019 à 23:11, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a écrit :
>
> Hello,
>
> On Mon, 13 May 2019 22:22:10 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > Fixes:
> >  - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
> Is this for both Qt latest and Qt LTS ?
Yes, I tested this patch with both of them. However, I don't know why
these build failures started on March 14th
(http://autobuild.buildroot.org/?reason=qt5webkit-examples%).
Did we make some changes to Qt5 around this date?
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice
Arnout Vandecappelle May 14, 2019, 8 p.m. UTC | #3
On 13/05/2019 23:18, Fabrice Fontaine wrote:
> Dear Thomas,
> 
> Le lun. 13 mai 2019 à 23:11, Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> a écrit :
>>
>> Hello,
>>
>> On Mon, 13 May 2019 22:22:10 +0200
>> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>>
>>> Fixes:
>>>  - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
>>>
>>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>>
>> Is this for both Qt latest and Qt LTS ?
> Yes, I tested this patch with both of them. However, I don't know why
> these build failures started on March 14th
> (http://autobuild.buildroot.org/?reason=qt5webkit-examples%).
> Did we make some changes to Qt5 around this date?

 qt5webkit wouldn't build until 2d7c746ed8 committed on Mar 7, so we'd never get
around to building qt5webkit-examples.

 Regards,
 Arnout
Gaël PORTAY May 16, 2019, 3:55 p.m. UTC | #4
All,

On Tue, May 14, 2019 at 10:00:35PM +0200, Arnout Vandecappelle wrote:
> 
> 
> On 13/05/2019 23:18, Fabrice Fontaine wrote:
> > Dear Thomas,
> > 
> > Le lun. 13 mai 2019 à 23:11, Thomas Petazzoni
> > <thomas.petazzoni@bootlin.com> a écrit :
> >>
> >> Hello,
> >>
> >> On Mon, 13 May 2019 22:22:10 +0200
> >> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> >>
> >>> Fixes:
> >>>  - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
> >>>
> >>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> >>
> >> Is this for both Qt latest and Qt LTS ?
> > Yes, I tested this patch with both of them. However, I don't know why
> > these build failures started on March 14th
> > (http://autobuild.buildroot.org/?reason=qt5webkit-examples%).
> > Did we make some changes to Qt5 around this date?
> 
>  qt5webkit wouldn't build until 2d7c746ed8 committed on Mar 7, so we'd never get
> around to building qt5webkit-examples.
> 

Thanks for the investigation and the patch :)

IIRC, I was working on that issue for the bump to 5.12. I think
something has changed in qtbase that causes that build issue. But I did
not have the time to work on it then :/

>  Regards,
>  Arnout
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Regards,
Gaël
Arnout Vandecappelle May 26, 2019, 6:30 p.m. UTC | #5
On 13/05/2019 22:22, Fabrice Fontaine wrote:
> Fixes:
>  - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 Applied to master, thanks.

 Regards,
 Arnout

Patch
diff mbox series

diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch
new file mode 100644
index 0000000000..30aab30167
--- /dev/null
+++ b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch
@@ -0,0 +1,73 @@ 
+From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 12 May 2019 23:29:05 +0200
+Subject: [PATCH] Fix QWebView path
+
+QWebView is installed under QtWebKitWidgets
+
+Fixes:
+ - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ examples/webkitwidgets/formextractor/formextractor.ui           | 2 +-
+ examples/webkitwidgets/previewer/previewer.ui                   | 2 +-
+ examples/webkitwidgets/simpleselector/window.ui                 | 2 +-
+ .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui             | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui
+index 5c4afec..a38bdd5 100644
+--- a/examples/webkitwidgets/formextractor/formextractor.ui
++++ b/examples/webkitwidgets/formextractor/formextractor.ui
+@@ -151,7 +151,7 @@
+   <customwidget>
+    <class>QWebView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QtWebKitWidgets/QWebView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui
+index d4c9992..69adb2e 100644
+--- a/examples/webkitwidgets/previewer/previewer.ui
++++ b/examples/webkitwidgets/previewer/previewer.ui
+@@ -74,7 +74,7 @@
+   <customwidget>
+    <class>QWebView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QtWebKitWidgets/QWebView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui
+index aa824df..7906186 100644
+--- a/examples/webkitwidgets/simpleselector/window.ui
++++ b/examples/webkitwidgets/simpleselector/window.ui
+@@ -64,7 +64,7 @@
+   <customwidget>
+    <class>QWebView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QtWebKitWidgets/QWebView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
+index ad43284..000cae7 100644
+--- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
++++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
+@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; }
+   <customwidget>
+    <class>QWebView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QtWebKitWidgets/QWebView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+-- 
+2.20.1
+