Skip to contentSkip to conversation

qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

PATCH Superseded Julien Corjon 4 participants 5 messages Jul 24, 2015 – Jul 26, 2015

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Julien Corjon

author
#0 lore raw

PATCH v2 1/1 qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

Fixes:
http://autobuild.buildroot.net/results/4be77432390c4cfb557c3f2cc52cf732de037949/
http://autobuild.buildroot.net/results/255a77e01d8af4090e03acb82f9ad93b7c4dd212/
http://autobuild.buildroot.net/results/7844e6a3eeecf67dc29277b73bfe714e4d8f0d85/
http://autobuild.buildroot.net/results/b941f35b6c8e1cf3b2c4b046dfcce98700d8f408/
http://autobuild.buildroot.net/results/c64b640a39285f59cde47cb8d06ab70a5ac97c8b/
http://autobuild.buildroot.net/results/f6d24b50f58251c8051d39bc1d09b5b43f81f441/

Signed-off-by Julien Corjon <[email protected]>

---
v1 -> v2 :
- Add autobuild references (suggested by thomas)

 ...008-QtGui-force-image-dir-in-include_path.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch
package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +33 -0
new file mode 100644
index 0000000..4e5068b
@@ -0,0 +1,33 @@
+From 6065be41dbd04690236418098fca504140fc205c Mon Sep 17 00:00:00 2001
+From: Julien Corjon <[email protected]>
+Date: Thu, 23 Jul 2015 13:32:47 +0200
+Subject: [PATCH 1/1] QtGui: force image directory in INCLUDE_PATH
+
+If PNG/JPEG/GIF support is not set qplaformpixmap inclusion then
+image/qplatformpixmap.h cannot be found from painting/qbrush.cpp
+
+Change-Id: I165c888b2afc51de47267607883615d3aa3bae40
+
+Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47400
+
+Signed-off-by: Julien Corjon <[email protected]>
+---
+ src/gui/image/image.pri | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
+index 8db944e..af6e0fa 100644
+--- a/src/gui/image/image.pri
++++ b/src/gui/image/image.pri
+@@ -3,6 +3,8 @@
+ 
+ # Qt kernel module
+ 
++INCLUDEPATH *= $$PWD
++
+ HEADERS += \
+         image/qbitmap.h \
+         image/qimage.h \
+-- 
+2.1.0
+
Signature · 1 line
2.1.0
#1 lore raw

PATCH v2 1/1 qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

Quoted 9 lines · Julien Corjon

Fixes:
http://autobuild.buildroot.net/results/4be77432390c4cfb557c3f2cc52cf732de037949/
http://autobuild.buildroot.net/results/255a77e01d8af4090e03acb82f9ad93b7c4dd212/
http://autobuild.buildroot.net/results/7844e6a3eeecf67dc29277b73bfe714e4d8f0d85/
http://autobuild.buildroot.net/results/b941f35b6c8e1cf3b2c4b046dfcce98700d8f408/
http://autobuild.buildroot.net/results/c64b640a39285f59cde47cb8d06ab70a5ac97c8b/
http://autobuild.buildroot.net/results/f6d24b50f58251c8051d39bc1d09b5b43f81f441/

Signed-off-by Julien Corjon <[email protected]>
Tested-by Yegor Yefremov <[email protected]>
Quoted 54 lines

---
v1 -> v2 :
- Add autobuild references (suggested by thomas)

 ...008-QtGui-force-image-dir-in-include_path.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch
package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +33 -1
new file mode 100644
index 0000000..4e5068b
@@ -0,0 +1,33 @@
+From 6065be41dbd04690236418098fca504140fc205c Mon Sep 17 00:00:00 2001
+From: Julien Corjon <[email protected]>
+Date: Thu, 23 Jul 2015 13:32:47 +0200
+Subject: [PATCH 1/1] QtGui: force image directory in INCLUDE_PATH
+
+If PNG/JPEG/GIF support is not set qplaformpixmap inclusion then
+image/qplatformpixmap.h cannot be found from painting/qbrush.cpp
+
+Change-Id: I165c888b2afc51de47267607883615d3aa3bae40
+
+Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47400
+
+Signed-off-by: Julien Corjon <[email protected]>
+---
+ src/gui/image/image.pri | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
+index 8db944e..af6e0fa 100644
+--- a/src/gui/image/image.pri
++++ b/src/gui/image/image.pri
+@@ -3,6 +3,8 @@
+
+ # Qt kernel module
+
++INCLUDEPATH *= $$PWD
++
+ HEADERS += \
+         image/qbitmap.h \
+         image/qimage.h \
+--
+2.1.0
+
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#2 lore raw

PATCH v2 1/1 qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

In reply to Julien Corjon

Julien, All,

On 2015-07-24 07:51 +0200, Julien Corjon spake thusly:

Quoted 40 lines

Fixes:
http://autobuild.buildroot.net/results/4be77432390c4cfb557c3f2cc52cf732de037949/
http://autobuild.buildroot.net/results/255a77e01d8af4090e03acb82f9ad93b7c4dd212/
http://autobuild.buildroot.net/results/7844e6a3eeecf67dc29277b73bfe714e4d8f0d85/
http://autobuild.buildroot.net/results/b941f35b6c8e1cf3b2c4b046dfcce98700d8f408/
http://autobuild.buildroot.net/results/c64b640a39285f59cde47cb8d06ab70a5ac97c8b/
http://autobuild.buildroot.net/results/f6d24b50f58251c8051d39bc1d09b5b43f81f441/

Signed-off-by Julien Corjon <[email protected]>

---
v1 -> v2 :
- Add autobuild references (suggested by thomas)

 ...008-QtGui-force-image-dir-in-include_path.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch
package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +17 -0
new file mode 100644
index 0000000..4e5068b
@@ -0,0 +1,33 @@
+From 6065be41dbd04690236418098fca504140fc205c Mon Sep 17 00:00:00 2001
+From: Julien Corjon <[email protected]>
+Date: Thu, 23 Jul 2015 13:32:47 +0200
+Subject: [PATCH 1/1] QtGui: force image directory in INCLUDE_PATH
+
+If PNG/JPEG/GIF support is not set qplaformpixmap inclusion then
+image/qplatformpixmap.h cannot be found from painting/qbrush.cpp
+
+Change-Id: I165c888b2afc51de47267607883615d3aa3bae40
+
+Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47400
+
+Signed-off-by: Julien Corjon <[email protected]>
+---
+ src/gui/image/image.pri | 2 ++
+ 1 file changed, 2 insertions(+)
+

package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch line 27

Quoted 10 lines
package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +10 -0
+diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
+index 8db944e..af6e0fa 100644
+--- a/src/gui/image/image.pri
++++ b/src/gui/image/image.pri
+@@ -3,6 +3,8 @@
+ 
+ # Qt kernel module
+ 
++INCLUDEPATH *= $$PWD
++

It seems like we should instead use the upstream patch that has been applied:

    https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=7f282aa9f718389199b95b7f53ecd6401172fcc6;hp=954f0d93976362d29044439e4eaa11d2dff16624

Regards,
Yann E. MORIN.

Quoted 13 lines
package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +6 -0
+ HEADERS += \
+         image/qbitmap.h \
+         image/qimage.h \
+-- 
+2.1.0
+
Signature · 6 lines
2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#3 lore raw

PATCH v2 1/1 qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

Dear Yann,

Le 25 juil. 2015 ? 23:55, Yann E. MORIN <yann.morin.1998 at free.fr<mailto:[email protected]>> a ?crit :

Julien, All,

On 2015-07-24 07:51 +0200, Julien Corjon spake thusly:
Fixes:
http://autobuild.buildroot.net/results/4be77432390c4cfb557c3f2cc52cf732de037949/
http://autobuild.buildroot.net/results/255a77e01d8af4090e03acb82f9ad93b7c4dd212/
http://autobuild.buildroot.net/results/7844e6a3eeecf67dc29277b73bfe714e4d8f0d85/
http://autobuild.buildroot.net/results/b941f35b6c8e1cf3b2c4b046dfcce98700d8f408/
http://autobuild.buildroot.net/results/c64b640a39285f59cde47cb8d06ab70a5ac97c8b/
http://autobuild.buildroot.net/results/f6d24b50f58251c8051d39bc1d09b5b43f81f441/

Signed-off-by Julien Corjon <corjon.j at ecagroup.com<mailto:[email protected]>>

---
v1 -> v2 :
- Add autobuild references (suggested by thomas)

...008-QtGui-force-image-dir-in-include_path.patch | 33 ++++++++++++++++++++++

1 file changed, 33 insertions(+)

create mode 100644 package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch

package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file +27 -0
new file mode 100644
index 0000000..4e5068b
@@ -0,0 +1,33 @@
+From 6065be41dbd04690236418098fca504140fc205c Mon Sep 17 00:00:00 2001
+From: Julien Corjon <corjon.j at ecagroup.com<mailto:[email protected]>>
+Date: Thu, 23 Jul 2015 13:32:47 +0200
+Subject: [PATCH 1/1] QtGui: force image directory in INCLUDE_PATH
+
+If PNG/JPEG/GIF support is not set qplaformpixmap inclusion then
+image/qplatformpixmap.h cannot be found from painting/qbrush.cpp
+
+Change-Id: I165c888b2afc51de47267607883615d3aa3bae40
+
+Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47400
+
+Signed-off-by: Julien Corjon <corjon.j at ecagroup.com<mailto:[email protected]>>
+---
+ src/gui/image/image.pri | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
+index 8db944e..af6e0fa 100644
+--- a/src/gui/image/image.pri
++++ b/src/gui/image/image.pri
+@@ -3,6 +3,8 @@
+
+ # Qt kernel module
+
++INCLUDEPATH *= $$PWD
++

It seems like we should instead use the upstream patch that has been applied:
https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=7f282aa9f718389199b95b7f53ecd6401172fcc6;hp=954f0d93976362d29044439e4eaa11d2dff16624

Sure, we should! But let?s wait for the review to be finished ;-) This patch has only been applied to the staging branch for the moment. See https://codereview.qt-project.org/#/c/122145/

Regards,
Julien

Regards,
Yann E. MORIN.

+ HEADERS += \
+ image/qbitmap.h \
+ image/qimage.h \
+--
+2.1.0
+
--
2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net<mailto:[email protected]>
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

#4 lore raw

PATCH v2 1/1 qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support

Hello,

Quoted 3 lines · Julien CORJON

Sure, we should! But let?s wait for the review to be finished ;-) This patch has only been applied to the staging branch for the moment. See https://codereview.qt-project.org/#/c/122145/

Ok, so I'll wait for a new patch from you that backports the upstream patch then. In the mean time, I'll mark your patch as Changes Requested.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com