recipes: upgrade from 5.3.2 to 5.4.0

MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>

11 files changed, 64 insertions, 380 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch b/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch
deleted file mode 100644
index 915d3e82..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a6802bc4528205a9d3839a1f22d4fca32154f5f0 Mon Sep 17 00:00:00 2001
-From: Simon Busch <morphis@gravedo.de>
-Date: Fri, 20 Jun 2014 09:09:12 +0200
-Subject: [PATCH 1/6] Use ninja supplied by environment variable NINJA_PATH
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
----
- tools/qmake/mkspecs/features/functions.prf | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 4dcd8ed..8725fd2 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -84,16 +84,6 @@ defineReplace(which) {
- }
- 
- defineReplace(findOrBuildNinja) {
--    git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
--    # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
--    isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
--
--    out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT")
--    win32: out = $$system_path($${out}.exe)
--
--    # If we did not find ninja, then we bootstrap it.
--    !exists($$out) {
--        system("python $$dirname(out)/bootstrap.py")
--    }
--    return($$out)
-+    message(Using ninja from path $$NINJA_PATH)
-+    return($$NINJA_PATH)
- }
--- 
-2.1.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
deleted file mode 100644
index abd351a6..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 0c59430e6b919d4ffec80bfa6b50b9ce9953ac21 Mon Sep 17 00:00:00 2001
-From: Simon Busch <morphis@gravedo.de>
-Date: Fri, 20 Jun 2014 09:05:12 +0200
-Subject: [PATCH 1/2] <chromium> Drop build time only dependency on x11
- libraries
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- chromium/build/linux/system.gyp | 114 ----------------------------------------
- 1 file changed, 114 deletions(-)
-
-diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp
-index 9911317..85016b8 100644
---- a/src/3rdparty/chromium/build/linux/system.gyp
-+++ b/src/3rdparty/chromium/build/linux/system.gyp
-@@ -786,119 +786,5 @@
-         }],
-       ],
-     },
--    {
--      'target_name': 'x11',
--      'type': 'none',
--      'toolsets': ['host', 'target'],
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags x11)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l x11 xi)',
--            ],
--          },
--        }, {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(pkg-config --cflags x11)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
--            ],
--            'libraries': [
--              '<!@(pkg-config --libs-only-l x11 xi)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xext',
--      'type': 'none',
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xext)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xext)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xfixes',
--      'type': 'none',
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xfixes)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xfixes)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xrandr',
--      'type': 'none',
--      'toolsets': ['host', 'target'],
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xrandr)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xrandr)',
--            ],
--          },
--        }, {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(pkg-config --cflags xrandr)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
--            ],
--            'libraries': [
--              '<!@(pkg-config --libs-only-l xrandr)',
--            ],
--          },
--        }],
--      ],
--    },
-   ],
- }
--- 
-2.0.0
-
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index d0437147..4587219e 100644
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,8 +1,8 @@
-From 7266e333c6568fec1e2ebbf0c2d68c4025397b2d Mon Sep 17 00:00:00 2001
+From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 30 Jun 2014 20:08:17 +0200
-Subject: [PATCH 2/6] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
- anywhere in patch, but at the end
+Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
+ anywhere in path, but at the end
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 8725fd2..15c2941 100644
+index acf15a8..08b2642 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) {
+@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) {
  defineReplace(mocOutput) {
    out = $$1
    # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
@@ -25,5 +25,5 @@ index 8725fd2..15c2941 100644
  }
  
 -- 
-2.1.1
+2.1.3
 
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch
deleted file mode 100644
index 0cbe7aa4..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From faaba972642f1966b4e38394b022d79de114c71e Mon Sep 17 00:00:00 2001
-From: Simon Busch <morphis@gravedo.de>
-Date: Fri, 20 Jun 2014 19:04:14 +0200
-Subject: [PATCH 2/2] <chromium> Strip unwanted "@echo compiling &&" prefix
- from ${CC}
-
-Causes problems when called from a perl script:
-
-@echo compiling  && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloinCan't exec "@echo": No such file or directory at /home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/IPC/Open3.pm line 288.
-open2: exec of @echo compiling && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloin -E -P -x c++ -DENABLE_CUSTOM_SCHEME_HANDLER=0 -DENABLE_SVG_FONTS=1 -DENABLE_GDI_FONTS_ON_WINDOWS=0 -DENABLE_HARFBUZZ_ON_WINDOWS=1 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_SPEECH=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_MEDIA_CAPTURE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=1 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_WEB_AUDIO=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DENABLE_OPENTYPE_VERTICAL=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 css/html.css failed at ../build/scripts/preprocessor.pm line 81
-Traceback (most recent call last):
-  File "../build/scripts/action_useragentstylesheets.py", line 124, in <module>
-    sys.exit(main(sys.argv))
-  File "../build/scripts/action_useragentstylesheets.py", line 118, in main
-    assert returnCode == 0
-AssertionError
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../WebKit/Source/build/scripts/action_useragentstylesheets.py         | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
-index c0712b3..8460637 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py
-@@ -112,6 +112,9 @@ def main(args):
-     command.extend([outputH, outputCpp])
-     command.extend(styleSheets)
- 
-+    if os.environ["CC"].startswith("@echo"):
-+        os.environ["CC"] = os.environ["CC"].replace("@echo compiling  &&", "")
-+
-     # Do it. check_call is new in 2.5, so simulate its behavior with call and
-     # assert.
-     returnCode = subprocess.call(command)
--- 
-2.0.0
-
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
new file mode 100644
index 00000000..58218a56
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -0,0 +1,29 @@
+From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001
+From: Simon Busch <morphis@gravedo.de>
+Date: Tue, 18 Nov 2014 10:38:18 +0100
+Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
+ generate it's moc'ed abbreviation
+
+Signed-off-by: Simon Busch <morphis@gravedo.de>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ tools/qmake/mkspecs/features/functions.prf | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
+index 08b2642..0123336 100644
+--- a/tools/qmake/mkspecs/features/functions.prf
++++ b/tools/qmake/mkspecs/features/functions.prf
+@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) {
+ }
+ 
+ defineReplace(mocOutput) {
+-  out = $$1
++  in = $$1
++  out = $$basename(in)
+   # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
+   out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
+   out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
+-- 
+2.1.3
+
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
deleted file mode 100644
index 1cf12424..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ad77853050ccd2102fe4c9ad0671b82554ce4c1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 3 Oct 2014 03:52:11 +0200
-Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc when
- building for x64 arch
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- chromium/base/base.gypi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
-index a5a990a..af30cfa 100644
---- a/src/3rdparty/chromium/base/base.gypi
-+++ b/src/3rdparty/chromium/base/base.gypi
-@@ -745,7 +745,7 @@
-                 ['include', '^nix/'],
-               ],
-           }],
--          ['use_qt==1 and target_arch=="ia32"', {
-+          ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
-               'sources/': [
-                 ['include', 'atomicops_internals_x86_gcc.cc'],
-               ],
--- 
-2.1.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch
deleted file mode 100644
index 2e2c177e..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8e540a678a796d78ff9a98986d747afbca7f63be Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 1 Jul 2014 15:58:16 +0200
-Subject: [PATCH 3/6] functions.prf: Try to add _moc suffix
-
-* otherwise moc generated files have the same basename and do_configure fails with:
-  core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
-  |   javascript_dialog_controller: javascript_dialog_controller.cpp
-  | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
-  ...
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- tools/qmake/mkspecs/features/functions.prf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 15c2941..78b1190 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) {
- defineReplace(mocOutput) {
-   out = $$1
-   # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
--  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
--  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
-+  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC})
-+  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)})
-   return($$out)
- }
- 
--- 
-2.1.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
new file mode 100644
index 00000000..b19556ff
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -0,0 +1,29 @@
+From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001
+From: Frieder Schrempf <frieder.schrempf@online.de>
+Date: Mon, 1 Dec 2014 14:34:40 +0000
+Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ tools/qmake/mkspecs/features/functions.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
+index 0123336..5cea82a 100644
+--- a/tools/qmake/mkspecs/features/functions.prf
++++ b/tools/qmake/mkspecs/features/functions.prf
+@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) {
+ 
+   linux-g++*:!isGCCVersionSupported():return(false)
+   !isPythonVersionSupported(): return(false)
+-  linux-g++*|win32-msvc2013|macx-clang: return(true)
++  linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
+   boot2qt: return(true)
+ 
+   warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".)
+-- 
+2.1.3
+
diff --git a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch b/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch
deleted file mode 100644
index a3842ecd..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c99aed6ef28c4ac9c00024a40222331c0e682d28 Mon Sep 17 00:00:00 2001
-From: Andras Becsi <andras.becsi@digia.com>
-Date: Thu, 18 Sep 2014 18:22:37 +0200
-Subject: [PATCH 4/6] Set arm_tune to empty string if mtune flag is not set by
- toolchain
-
-Since the default arm_tune option applied by chromium is not
-recognized by our gcc toolchain set arm_tune to empty string
-to prevent chromium from setting a default. Our toolchains
-set the arm version which already implies the corresponding
-mtune option anyway.
-
-Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
----
- src/core/gyp_run.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-index ed592e1..4845af2 100644
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -47,7 +47,7 @@ cross_compile {
-         !isEmpty(MARCH): GYP_ARGS += "-D arm_arch=\"$$MARCH\""
- 
-         MTUNE = $$extractCFlag("-mtune=.*")
--        !isEmpty(MTUNE): GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
-+        GYP_ARGS += "-D arm_tune=\"$$MTUNE\""
- 
-         MFLOAT = $$extractCFlag("-mfloat-abi=.*")
-         !isEmpty(MFLOAT): GYP_ARGS += "-D arm_float_abi=\"$$MFLOAT\""
--- 
-2.1.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch b/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch
deleted file mode 100644
index 943f6715..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-Fix-ARM-NEON-detection-for-mfpu-neon-vfpv4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1331c66c937f1c3e10e193932db2037dc38434e9 Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 15 Oct 2014 17:02:16 +1100
-Subject: [PATCH 5/6] Fix ARM NEON detection for -mfpu=neon-vfpv4
-
-Upstream-Status: Backport
-
-Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e
-Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/core/gyp_run.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-index 4845af2..66e97f4 100644
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -64,7 +64,7 @@ cross_compile {
-             # If the toolchain does not explicitly specify to use NEON instructions
-             # we use arm_neon_optional for ARMv7 and newer and let chromium decide
-             # about the mfpu option.
--            contains(MFPU, "neon"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
-+            contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
-             else:!lessThan(MARMV, 7): GYP_ARGS += "-D arm_neon=0 -D arm_neon_optional=1"
-             else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=0 -D arm_neon_optional=0"
-         }
--- 
-2.1.1
-
diff --git a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch b/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch
deleted file mode 100644
index 920dd91b..00000000
--- a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d242c15eb961fbdee69c0a0989cd100d174a25db Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 15 Oct 2014 17:01:06 +1100
-Subject: [PATCH 6/6] Include QMAKE_CC when extracting C compiler flags
-
-This fixes cross-compile settings detection for cross-compilation
-environments where the C compiler cross-compilation flags are set in
-CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded).
-
-Upstream-Status: Backport
-
-Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285
-Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- tools/qmake/mkspecs/features/functions.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 78b1190..37dd615 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -14,7 +14,7 @@ defineReplace(getConfigDir) {
- }
- 
- defineReplace(extractCFlag) {
--    CFLAGS = $$QMAKE_CFLAGS
-+    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
-     !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
-     OPTION = $$find(CFLAGS, $$1)
-     OPTION = $$split(OPTION, =)
--- 
-2.1.1
-