summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarian Cichy <m.cichy@pengutronix.de>2020-10-27 17:29:34 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-10-28 10:20:15 +0100
commitec7e97a8ab6609f68d7f19d2d5726ba279fcff7f (patch)
tree8be9e0767302842cf3737fa6abe33f46e10b5771
parent9b8e3b18943b5457bc5c49fbbf95123ca94e4c79 (diff)
downloadptxdist-ec7e97a8ab6609f68d7f19d2d5726ba279fcff7f.tar.gz
ptxdist-ec7e97a8ab6609f68d7f19d2d5726ba279fcff7f.tar.xz
ptxdist: let newpackage use qt5 by default
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>
-rw-r--r--rules/templates/template-src-qmake-prog-in2
-rw-r--r--rules/templates/template-src-qmake-prog-make1
2 files changed, 2 insertions, 1 deletions
diff --git a/rules/templates/template-src-qmake-prog-in b/rules/templates/template-src-qmake-prog-in
index 914b6816c..a20378948 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 13f312e1e..1a9d0d6f3 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