From patchwork Wed Dec 23 12:12:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 560483 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 166E4140BEE for ; Wed, 23 Dec 2015 23:13:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BC24492660; Wed, 23 Dec 2015 12:13:31 +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 0ykxSu9mZuEb; Wed, 23 Dec 2015 12:13:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 166299264F; Wed, 23 Dec 2015 12:13:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4BA1E1C0FC2 for ; Wed, 23 Dec 2015 12:13:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4575393A44 for ; Wed, 23 Dec 2015 12:13:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NRaGtky9e7XX for ; Wed, 23 Dec 2015 12:13:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1E9929393F for ; Wed, 23 Dec 2015 12:13:25 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id p187so144095446wmp.1 for ; Wed, 23 Dec 2015 04:13:25 -0800 (PST) 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=vnzYwxIpTD2lGdZsuIPb+gQHcY10/tzvWGVG+aKoMPM=; b=VAwUK0ybNM2zfE48xiR3QZ2QRF5cpa1UA6yaOqku7spRbEBJUl1vs4lVChhdaBQ1/M zBkYtnoHrevXPvYdTUKmJWxLlku2MvvAExTEjR00lZIErIx25c2yrov1EvQDgKHZiD/t 07Nf/bHybVtfk5eccEuFLqO2Fp3ZHZbfGeV6V0VZP4zXKj91mVBNi/t7dQM0bqXG57Bq Jm4L8L/uwMkqIdpVESTxV9mvGb/odHt0YHxquPc+T7aCv3fj8bh9A8jDtEnGpOaTRB1w kcwzBSMBhw+Pj61BautOizmMojgpxMT0kCMElqI4xgxxRF3HBkzn9jZaCerqmKlymU9V hVcA== X-Received: by 10.28.150.215 with SMTP id y206mr24491118wmd.8.1450872803441; Wed, 23 Dec 2015 04:13:23 -0800 (PST) Received: from mic341-linux.sinters-int.fr ([82.236.247.27]) by smtp.gmail.com with ESMTPSA id z1sm37142553wje.35.2015.12.23.04.13.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 04:13:22 -0800 (PST) From: Julien Corjon To: buildroot@buildroot.org Date: Wed, 23 Dec 2015 13:12:48 +0100 Message-Id: <1450872768-27153-1-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.5.0 Cc: ECA SINTERS software Subject: [Buildroot] [PATCH 1/1] qt5/qt5webchannel: add qwebchannel.js installation choice 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" To use webchannel in an application qwebchannel.js is needed but this file is not installed. Add an option to fix that and let the user choose the location. Signed-off-by: Julien Corjon --- package/qt5/qt5webchannel/Config.in | 12 ++++++++++++ package/qt5/qt5webchannel/qt5webchannel.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index 218629a..3e6bb4e 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -9,3 +9,15 @@ config BR2_PACKAGE_QT5WEBCHANNEL This package corresponds to the qt5webchannel module. http://qt.io + +if BR2_PACKAGE_QT5WEBCHANNEL + +config BR2_PACKAGE_QT5WEBCHANNEL_JAVASCRIPT_FILE + string "qwebchannel.js installation path" + help + It might be useful for your application to install + qwebchannel.js file in a specific location on the target. + + Leave path empty to cancel qwebchannel.js installation. + +endif diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index cfb6da9..6901764 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -35,6 +35,12 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS $(QT5_LA_PRL_FILES_FIXUP) endef +ifneq ($(BR2_PACKAGE_QT5WEBCHANNEL_JAVASCRIPT_FILE),"") +define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT + $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js $(TARGET_DIR)$(BR2_PACKAGE_QT5WEBCHANNEL_JAVASCRIPT_FILE)/qwebchannel.js +endef +endif + ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) define QT5WEBCHANNEL_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/ @@ -56,6 +62,7 @@ endif define QT5WEBCHANNEL_INSTALL_TARGET_CMDS $(QT5WEBCHANNEL_INSTALL_TARGET_LIBS) $(QT5WEBCHANNEL_INSTALL_TARGET_QMLS) + $(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT) endef $(eval $(generic-package))