From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20201027162934.14648-1-m.cichy@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1kYT79-00FrzS-Jw@dude03.red.stw.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 30 Oct 2020 13:02:39 +0100
Subject: Re: [ptxdist] [APPLIED] ptxdist: let newpackage use qt5 by default
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <m.cichy@pengutronix.de>

Thanks, applied as ec7e97a8ab6609f68d7f19d2d5726ba279fcff7f.

Michael

[sent from post-receive hook]

On Fri, 30 Oct 2020 13:02:39 +0100, Marian Cichy <m.cichy@pengutronix.de> wrote:
> when using 'ptxdist newpackage src-qmake-prog, ptxdist
> generates rule-files that uses qt4 build-tools. Since
> qt4 is quite obsolete, lets switch to qt5 as default.
> 
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
> Message-Id: <20201027162934.14648-1-m.cichy@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/templates/template-src-qmake-prog-in b/rules/templates/template-src-qmake-prog-in
> index 914b6816c7c9..a20378948032 100644
> --- a/rules/templates/template-src-qmake-prog-in
> +++ b/rules/templates/template-src-qmake-prog-in
> @@ -3,6 +3,6 @@
>  config @PACKAGE@
>  	bool
>  	prompt "@package@"
> -	select QT4
> +	select QT5
>  	help
>  	  FIXME
> diff --git a/rules/templates/template-src-qmake-prog-make b/rules/templates/template-src-qmake-prog-make
> index 13f312e1e621..1a9d0d6f3a16 100644
> --- a/rules/templates/template-src-qmake-prog-make
> +++ b/rules/templates/template-src-qmake-prog-make
> @@ -39,6 +39,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
>  #
>  # qmake
>  #
> +@PACKAGE@_PATH		:= PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH)
>  @PACKAGE@_CONF_TOOL	:= qmake
>  @PACKAGE@_CONF_OPT	:= $(CROSS_QMAKE_OPT) PREFIX=/usr
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de