Thanks, applied as ec7e97a8ab6609f68d7f19d2d5726ba279fcff7f. Michael
[sent from post-receive hook] On Fri, 30 Oct 2020 13:02:39 +0100, Marian Cichy <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
