[PATCH] Simplier way to get QT_VERSION
Dirk Hohndel
dirk at hohndel.org
Sat May 12 11:00:37 PDT 2018
> On May 12, 2018, at 9:47 AM, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
>
> On 12 May 2018 at 19:35, Cristian Ionescu-Idbohrn
> <cristian.ionescu-idbohrn at axis.com> wrote:
>> Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
>> ---
>> scripts/build.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/build.sh b/scripts/build.sh
>> index f0f3f2f61..c8ca3bd0a 100755
>> --- a/scripts/build.sh
>> +++ b/scripts/build.sh
>> @@ -152,7 +152,7 @@ fi
>> # QtPositioning headers aren't bundled. Download them if necessary.
>> if [ $PLATFORM = Linux ] ; then
>> QT_HEADERS_PATH=`$QMAKE -query QT_INSTALL_HEADERS`
>> - QT_VERSION=`$QMAKE -v | grep "Qt" | cut -d" " -f4`
>> + QT_VERSION=`$QMAKE -query QT_VERSION`
>>
>> if [ ! -d "$QT_HEADERS_PATH/QtLocation/$QT_VERSION/QtLocation/private" ] &&
>> [ ! -d $INSTALL_ROOT/include/QtLocation/private ] ; then
>
> ACK,
> Dirk, permission to merge?
Sure - just remember, if you take it as a patch, then you need to sign off, too
/D
More information about the subsurface
mailing list