>From fd7d0a2137ece3294703878fc1667e5196f766b9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 1 Nov 2015 21:12:53 -0600 Subject: [PATCH 1/1] Attempt to find qmake-qt5 and qmake-qt4 if no "qmake" is found in $PATH The Qt Project recommendation is that there should always be a "qmake" binary and it should never be renamed. If it's necessary to handle multiple Qt versions, the Qt Project recommends using qtchooser. Unfortunately, some distros do not follow the recommendation, so we need to test different possibilities... Signed-off-by: Thiago Macieira --- scripts/kconfig/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 33c4994..0511557 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -227,7 +227,9 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile # Qt needs some extra effort... $(obj)/.tmp_qtcheck: @set -e; $(kecho) " CHECK qt"; \ - qtver=`qmake -query QT_VERSION` || { \ + qtver=`qmake -query QT_VERSION` || \ + qtver=`qmake-qt5 -query QT_VERSION` || \ + qtver=`qmake-qt4 -query QT_VERSION` || { \ echo >&2 "*"; \ echo >&2 "* qmake failed."; \ echo >&2 "*"; \ -- 2.6.2