From patchwork Fri Jul 24 05:51:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 499595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 791CD140A98 for ; Fri, 24 Jul 2015 15:51:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B93EC23575; Fri, 24 Jul 2015 05:51:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lId5jjNMoZaS; Fri, 24 Jul 2015 05:51:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7597631D77; Fri, 24 Jul 2015 05:51:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 708421C2333 for ; Fri, 24 Jul 2015 05:51:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6BB2131D77 for ; Fri, 24 Jul 2015 05:51:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SL2Fj-4ge-3p for ; Fri, 24 Jul 2015 05:51:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by silver.osuosl.org (Postfix) with ESMTPS id F33A723575 for ; Fri, 24 Jul 2015 05:51:46 +0000 (UTC) Received: by wibud3 with SMTP id ud3so51204910wib.1 for ; Thu, 23 Jul 2015 22:51:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=1i0XlxVZzz24gSU7Tj3kXZcx70LdFJRRFr4WB8W+Bnc=; b=FBcfAD1BiUN7zFU0Z7WbEWRkiU5sd5c2c608Ztkhrpd+soiwQFsi8eBCVTZTsUIDMt y2FmlaKVycM0Wm8Vvhaji9RhMqLy3LcwzBdy999NT8rVmptNC86mpysoryVXtXb6bz1e /vUZzADfAJKLNCCc2D9lInBNe8tYKJDhna5R52U6YaPnyqf53IQquNJx0pWqLAGToAv8 wj0F0YQju03uINOpsjeSetpcAMEF3MAbaOpg2Is0p3F/noaNSJwbpBpefbBq92ZAv45n d+8oPaLgdHDisadV3wGl/yH4tUhz42ohqfX+2vnNl7efYteJeBI+dcR0NtgcqtjaRxvj UzfA== X-Received: by 10.180.206.211 with SMTP id lq19mr3892531wic.81.1437717105371; Thu, 23 Jul 2015 22:51:45 -0700 (PDT) Received: from mic341-linux.sinters-int.fr ([195.200.174.78]) by smtp.gmail.com with ESMTPSA id c7sm10794106wjb.19.2015.07.23.22.51.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jul 2015 22:51:44 -0700 (PDT) From: Julien Corjon To: buildroot@buildroot.org Date: Fri, 24 Jul 2015 07:51:40 +0200 Message-Id: <1437717100-13749-1-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.1.0 Cc: ECA SINTERS software Subject: [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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Tested-by: Yegor Yefremov --- 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 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 ++ + HEADERS += \ + image/qbitmap.h \ + image/qimage.h \ +-- +2.1.0 +