From patchwork Thu May 8 10:19:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 346975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 682DB140088 for ; Thu, 8 May 2014 20:21:11 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AD4A98BD43; Thu, 8 May 2014 10:21:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1nBfdadOKcpU; Thu, 8 May 2014 10:21:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 957668B9D5; Thu, 8 May 2014 10:21:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 47E641C0505 for ; Thu, 8 May 2014 10:21:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4363B8BD2E for ; Thu, 8 May 2014 10:21:06 +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 ApcBurvKWjVx for ; Thu, 8 May 2014 10:21:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (unknown [195.89.28.115]) by whitealder.osuosl.org (Postfix) with ESMTP id A30208B689 for ; Thu, 8 May 2014 10:21:04 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id B8A6C8145AE81 for ; Thu, 8 May 2014 11:20:58 +0100 (IST) Received: from KLMAIL02.kl.imgtec.org (192.168.5.97) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 8 May 2014 11:21:00 +0100 Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by klmail02.kl.imgtec.org (192.168.5.97) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 8 May 2014 11:21:00 +0100 Received: from localhost.localdomain (192.168.154.104) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 8 May 2014 11:21:00 +0100 From: Vicente Olivert Riera To: Date: Thu, 8 May 2014 11:19:53 +0100 Message-ID: <1399544393-21292-1-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] Subject: [Buildroot] [PATCH] qt5connectivity: the poster example needs no widgets, but it needs quick X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Adding an upstream patch to fix an autobuild failure. Upstream commit: https://qt.gitorious.org/qt/qtconnectivity/commit/0156038682cc40d44fedfc28dc9b78d1a0e6203b Fixes: http://autobuild.buildroot.net/results/d12/d120355cbb42307d35e59bc4528e973a2b12150e/ Signed-off-by: Vicente Olivert Riera Reviewed-by: Markos Chandras --- ...ample-needs-no-widgets-but-it-needs-quick.patch | 67 ++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch diff --git a/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch b/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch new file mode 100644 index 0000000..d8b75f4 --- /dev/null +++ b/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch @@ -0,0 +1,67 @@ +qt5connectivity: the poster example needs no widgets, but it needs quick +Signed-off-by: Vicente Olivert Riera + +From 0156038682cc40d44fedfc28dc9b78d1a0e6203b Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Tue, 18 Feb 2014 15:28:48 +0100 +Subject: [PATCH] the poster example needs no widgets, but it needs quick + +Task-number: QTBUG-36893 +Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2 +Reviewed-by: Alex Blasche +Reviewed-by: Rolf Eike Beer +--- + examples/nfc/nfc.pro | 5 ++++- + examples/nfc/poster/poster.pro | 2 +- + examples/nfc/poster/qmlposter.cpp | 4 ++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro +index e4f7e35..0076a71 100644 +--- a/examples/nfc/nfc.pro ++++ b/examples/nfc/nfc.pro +@@ -2,7 +2,10 @@ TEMPLATE = subdirs + qtHaveModule(widgets) { + SUBDIRS += \ + annotatedurl \ +- ndefeditor \ ++ ndefeditor ++} ++qtHaveModule(quick) { ++ SUBDIRS += \ + poster + } + +diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro +index 47de298..b6e87ed 100644 +--- a/examples/nfc/poster/poster.pro ++++ b/examples/nfc/poster/poster.pro +@@ -1,4 +1,4 @@ +-QT += qml quick network nfc widgets ++QT += qml quick network nfc + + SOURCES += \ + qmlposter.cpp +diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp +index 89f3695..2fc943d 100644 +--- a/examples/nfc/poster/qmlposter.cpp ++++ b/examples/nfc/poster/qmlposter.cpp +@@ -38,13 +38,13 @@ + ** + ****************************************************************************/ + +-#include ++#include + #include + #include + + int main(int argc, char *argv[]) + { +- QApplication application(argc, argv); ++ QGuiApplication application(argc, argv); + const QString mainQmlApp = QLatin1String("qrc:/poster.qml"); + QQuickView view; + view.setSource(QUrl(mainQmlApp)); +-- +1.7.1 +