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, 5 insertions, 4 deletions

diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index bbeb75af..b830c9a9 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "\
     file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
 "
 SRC_URI = "\
-    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5_gpl-${PV}.tar.gz \
+    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \
 "
-SRC_URI[md5sum] = "67508b652098d2e05c4c2b5baeb170cc"
-SRC_URI[sha256sum] = "3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf"
-S = "${WORKDIR}/PyQt5_gpl-${PV}"
+SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0"
+SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827"
+
+S = "${WORKDIR}/PyQt5-${PV}"
 
 inherit qmake5
 DEPENDS = "qtbase qtdeclarative qtquickcontrols2"