qt5: version bump 5.12.2 -> 5.12.4

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

10 files changed, 3 insertions, 104 deletions

diff --git a/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch b/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch
deleted file mode 100644
index 983d8e5bf..000000000
--- a/patches/qt-everywhere-src-5.12.2/0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 13 May 2019 11:04:42 +0200
-Subject: [PATCH] Fix detection of the webengine-arm-thumb feature
-
-Configure tests must run in a clean environment. That's why functions
-that are defined below the mkspecs directory are discarded during the
-configure run. As a result, extractCFlag could not be found when
-running qtConftest_hasThumbFlag.
-
-This patch moves extractCFlag to src/core/config/functions.pri. Also,
-extractCFlag gets a qtwebengine_ prefix to avoid collisions with
-functions defined in other modules. The alias extractCFlag in
-functions.prf lets us use the old function within QtWebEngine itself.
-
-Fixes: QTBUG-75748
-Change-Id: I6be613fbc569d5f7b3c145ef44b9a7be8e2ecb9d
-Reviewed-by: Kai Koehne <kai.koehne@qt.io>
----
- qtwebengine/configure.pri                  | 8 +++++---
- qtwebengine/mkspecs/features/functions.prf | 9 ---------
- qtwebengine/src/core/config/functions.pri  | 8 ++++++++
- qtwebengine/src/core/config/linux.pri      | 6 ++++++
- 4 files changed, 19 insertions(+), 12 deletions(-)
- create mode 100644 qtwebengine/src/core/config/functions.pri
-
-diff --git a/qtwebengine/configure.pri b/qtwebengine/configure.pri
-index 26c57ce61fbe..897bea54098f 100644
---- a/qtwebengine/configure.pri
-+++ b/qtwebengine/configure.pri
-@@ -1,3 +1,5 @@
-+include(src/core/config/functions.pri)
-+
- # this must be done outside any function
- QTWEBENGINE_SOURCE_TREE = $$PWD
- 
-@@ -297,12 +299,12 @@ defineTest(qtConfTest_isWindowsHostCompiler64) {
- 
- # Fixme QTBUG-71772
- defineTest(qtConfTest_hasThumbFlag) {
--    FLAG = $$extractCFlag("-mthumb")
-+    FLAG = $$qtwebengine_extractCFlag("-mthumb")
-     !isEmpty(FLAG): return(true)
--    FLAG = $$extractCFlag("-marm")
-+    FLAG = $$qtwebengine_extractCFlag("-marm")
-     !isEmpty(FLAG): return(false)
- 
--    MARCH = $$extractCFlag("-march=.*")
-+    MARCH = $$qtwebengine_extractCFlag("-march=.*")
-     MARMV = $$replace(MARCH, "armv",)
-     !isEmpty(MARMV) {
-         MARMV = $$split(MARMV,)
-diff --git a/qtwebengine/mkspecs/features/functions.prf b/qtwebengine/mkspecs/features/functions.prf
-index f6aeea21a79f..9efa8958f9c6 100644
---- a/qtwebengine/mkspecs/features/functions.prf
-+++ b/qtwebengine/mkspecs/features/functions.prf
-@@ -10,15 +10,6 @@ defineReplace(getChromiumSrcDir) {
-   return($$git_chromium_src_dir)
- }
- 
--defineReplace(extractCFlag) {
--    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
--    OPTION = $$find(CFLAGS, $$1)
--    OPTION = $$split(OPTION, =)
--    PARAM = $$member(OPTION, 1)
--    !isEmpty(PARAM): return ($$PARAM)
--    return ($$OPTION)
--}
--
- defineReplace(which) {
-   out = $$1
-   win32 {
-diff --git a/qtwebengine/src/core/config/functions.pri b/qtwebengine/src/core/config/functions.pri
-new file mode 100644
-index 000000000000..8c11faa16ad2
---- /dev/null
-+++ b/qtwebengine/src/core/config/functions.pri
-@@ -0,0 +1,8 @@
-+defineReplace(qtwebengine_extractCFlag) {
-+    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
-+    OPTION = $$find(CFLAGS, $$1)
-+    OPTION = $$split(OPTION, =)
-+    PARAM = $$member(OPTION, 1)
-+    !isEmpty(PARAM): return ($$PARAM)
-+    return ($$OPTION)
-+}
-diff --git a/qtwebengine/src/core/config/linux.pri b/qtwebengine/src/core/config/linux.pri
-index 85b948db2527..fe5fe6d76346 100644
---- a/qtwebengine/src/core/config/linux.pri
-+++ b/qtwebengine/src/core/config/linux.pri
-@@ -1,4 +1,10 @@
- include(common.pri)
-+include(functions.pri)
-+
-+defineReplace(extractCFlag) {
-+    return($$qtwebengine_extractCFlag($$1))
-+}
-+
- QT_FOR_CONFIG += gui-private webenginecore-private
- 
- gn_args += \
diff --git a/patches/qt-everywhere-src-5.12.2/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch b/patches/qt-everywhere-src-5.12.4/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
index 1872c83ad..1872c83ad 100644
--- a/patches/qt-everywhere-src-5.12.2/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
+++ b/patches/qt-everywhere-src-5.12.4/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch b/patches/qt-everywhere-src-5.12.4/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
index c3935b413..c3935b413 100644
--- a/patches/qt-everywhere-src-5.12.2/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
+++ b/patches/qt-everywhere-src-5.12.4/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-src-5.12.4/0102-qt3d-link-with-latomic-if-necessary.patch
index 6445dc4f4..6445dc4f4 100644
--- a/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch
+++ b/patches/qt-everywhere-src-5.12.4/0102-qt3d-link-with-latomic-if-necessary.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0103-eglfs_kms-device-ordering-robustness.patch b/patches/qt-everywhere-src-5.12.4/0103-eglfs_kms-device-ordering-robustness.patch
index 24721e479..24721e479 100644
--- a/patches/qt-everywhere-src-5.12.2/0103-eglfs_kms-device-ordering-robustness.patch
+++ b/patches/qt-everywhere-src-5.12.4/0103-eglfs_kms-device-ordering-robustness.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-5.12.4/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
index 0a33b37a5..0a33b37a5 100644
--- a/patches/qt-everywhere-src-5.12.2/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
+++ b/patches/qt-everywhere-src-5.12.4/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch b/patches/qt-everywhere-src-5.12.4/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
index 58de4fe78..58de4fe78 100644
--- a/patches/qt-everywhere-src-5.12.2/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
+++ b/patches/qt-everywhere-src-5.12.4/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-src-5.12.4/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
index bef3dfc2f..bef3dfc2f 100644
--- a/patches/qt-everywhere-src-5.12.2/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
+++ b/patches/qt-everywhere-src-5.12.4/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
diff --git a/patches/qt-everywhere-src-5.12.2/0107-HACK-don-t-resolv-library-paths.patch b/patches/qt-everywhere-src-5.12.4/0107-HACK-don-t-resolv-library-paths.patch
index f6a3bb4cf..594fb684e 100644
--- a/patches/qt-everywhere-src-5.12.2/0107-HACK-don-t-resolv-library-paths.patch
+++ b/patches/qt-everywhere-src-5.12.4/0107-HACK-don-t-resolv-library-paths.patch
@@ -16,10 +16,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qtbase/mkspecs/features/qt_configure.prf b/qtbase/mkspecs/features/qt_configure.prf
-index 7ca65c92b3f1..5ce57b979617 100644
+index 95e54d72c9b0..3250187ba774 100644
 --- a/qtbase/mkspecs/features/qt_configure.prf
 +++ b/qtbase/mkspecs/features/qt_configure.prf
-@@ -573,7 +573,7 @@ defineTest(qtConfResolveLibs) {
+@@ -593,7 +593,7 @@ defineTest(qtConfResolveLibs) {
              out += $$l
          }
      }
diff --git a/patches/qt-everywhere-src-5.12.2/series b/patches/qt-everywhere-src-5.12.4/series
index 86e873397..9373b8a61 100644
--- a/patches/qt-everywhere-src-5.12.2/series
+++ b/patches/qt-everywhere-src-5.12.4/series
@@ -1,7 +1,6 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 #tag:upstream --start-number 1
-0001-Fix-detection-of-the-webengine-arm-thumb-feature.patch
 #tag:ptx --start-number 100
 0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
 0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
@@ -11,4 +10,4 @@
 0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
 0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
 0107-HACK-don-t-resolv-library-paths.patch
-# 74dfb52d93d8860fef3c4bb8daefbdaa  - git-ptx-patches magic
+# 8c228241c0d280cb7a529289095cb611  - git-ptx-patches magic