From patchwork Sun Jul 26 01:08:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 500018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 683AF1402E8 for ; Sun, 26 Jul 2015 11:08:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 355AA8DD47; Sun, 26 Jul 2015 01:08:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D31685fsNaXI; Sun, 26 Jul 2015 01:08:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 406DE8DD14; Sun, 26 Jul 2015 01:08:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A904F1C22BB for ; Sun, 26 Jul 2015 01:08:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A31588DD14 for ; Sun, 26 Jul 2015 01:08:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 463ApriC275o for ; Sun, 26 Jul 2015 01:08:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp-out-3.pacwan.net (smtp-out-3.pacwan.net [195.200.166.133]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E4A28B94A for ; Sun, 26 Jul 2015 01:08:37 +0000 (UTC) Received: from mail.sinters.fr (unknown [195.200.174.161]) by smtp-out-3.pacwan.net (Postfix) with ESMTP id 23CA42B7FDE; Sun, 26 Jul 2015 03:08:35 +0200 (CEST) Received: from MAIL-SINTERS-01.sinters-int.fr ([fe80::7dc5:feb4:84da:82b]) by MAIL-SINTERS-01.sinters-int.fr ([fe80::7dc5:feb4:84da:82b%10]) with mapi id 14.03.0210.002; Sun, 26 Jul 2015 03:08:34 +0200 From: Julien CORJON To: "Yann E. MORIN" Thread-Topic: [Buildroot] [PATCH v2] qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support Thread-Index: AQHQxfFAzJ9ec5Fp7Em5A2h5KjQcEZ3sm9OAgAA18AA= Date: Sun, 26 Jul 2015 01:08:33 +0000 Message-ID: References: <1437717100-13749-1-git-send-email-corjon.j@ecagroup.com> <20150725215529.GJ1847@free.fr> In-Reply-To: <20150725215529.GJ1847@free.fr> Accept-Language: fr-FR, en-US Content-Language: fr-FR X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.236.247.27] Content-ID: MIME-Version: 1.0 Cc: software , "buildroot@buildroot.org" Subject: Re: [Buildroot] [PATCH v2] qt/qt5base: Fix INCLUDE_PATH when no JPEG/PNG support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Dear Yann, Le 25 juil. 2015 à 23:55, Yann E. MORIN > 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 > --- 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 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@busybox.net 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. | '------------------------------^-------^------------------^--------------------' diff --git a/package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch b/package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch new file mode 100644 index 0000000..4e5068b --- /dev/null +++ b/package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch @@ -0,0 +1,33 @@ +From 6065be41dbd04690236418098fca504140fc205c Mon Sep 17 00:00:00 2001 +From: Julien Corjon > +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 > +--- + 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 ;-)