Merge remote-tracking branch 'qt/upstream/master' into 5.14

Notes:
  - Patch already present in 5.14 branch for qtwebengine musl build
    kept and upstream one (1a4ee018 qtwebengine: Fix musl build)
    discarded as that does not work with present content
  - Patch for time_t in qtbase (f6ad80f9 qtbase: Fix build on 32bit arches
    with 64bit time_t) is faulty, fixed in next commit

* qt/upstream/master:
  25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures
  4f3ed3ed qtwebkit: add missing flex-native dep
  456ec4ac qt5-creator, qtbase: Replace python with python3
  f264e5dd qtdeclarative: Ask for python3 explicitly
  f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t
  b7f4bd20 recipes: Use features_check instead of distro_features_check
  1a4ee018 qtwebengine: Fix musl build
  02715fff pyqt5: Upgrade to 5.13.2

Conflicts:
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtwebengine_git.bb

Change-Id: I650cc667ede8f68f85164f52835b5e9f8db213f5

1 files changed, 60 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
new file mode 100644
index 00000000..e1067016
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
@@ -0,0 +1,60 @@
+From dc94032e6132b41bd6927357e4a57c31436294eb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 26 Nov 2019 21:10:03 -0800
+Subject: [PATCH] Use python3 explicitly
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ qtdeclarative.pro                         | 2 +-
+ src/3rdparty/masm/masm.pri                | 4 ++--
+ tests/auto/qml/ecmascripttests/test262.py | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/qtdeclarative.pro b/qtdeclarative.pro
+index 5b94da9b6..0e3496ce8 100644
+--- a/qtdeclarative.pro
++++ b/qtdeclarative.pro
+@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
+ load(qt_parts)
+ 
+ !python_available {
+-    py_out = $$system('python -c "print(1)"')
++    py_out = $$system('python3 -c "print(1)"')
+     !equals(py_out, 1): error("Building QtQml requires Python.")
+     tmp = python_available
+     CONFIG += $$tmp
+diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
+index 0e63ac2ce..7a30ab64e 100644
+--- a/src/3rdparty/masm/masm.pri
++++ b/src/3rdparty/masm/masm.pri
+@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
+     udis86.output = udis86_itab.h
+     udis86.input = ITAB
+     udis86.CONFIG += no_link
+-    udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
++    udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
+     QMAKE_EXTRA_COMPILERS += udis86
+ 
+     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
+@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
+ retgen.script = $$PWD/yarr/create_regex_tables
+ retgen.input = retgen.script
+ retgen.CONFIG += no_link
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
+ QMAKE_EXTRA_COMPILERS += retgen
+ 
+ # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
+diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
+index 19551e3ba..bf3f79a45 100755
+--- a/tests/auto/qml/ecmascripttests/test262.py
++++ b/tests/auto/qml/ecmascripttests/test262.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2017 The Qt Company Ltd.
+-- 
+2.24.0
+