diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-09 14:15:18 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-09 16:12:26 +0300 |
commit | 5bd17acd072dd168bf1ecadde9cd2b9641c08c6c (patch) | |
tree | 78f015a9a9060dbe4778001e3b0e50dc30900276 /recipes-qt/qt5/qtwebengine | |
parent | e6897ccd0eec8fb5229e0fdd8f354292e0f49a16 (diff) | |
parent | 0e5756c97ace089ddd9714f0eafffd71dd15c6ab (diff) | |
download | meta-qt5-5bd17acd072dd168bf1ecadde9cd2b9641c08c6c.tar.gz |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig
qtbase: remove fonts packages
qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle
qt5: upgrade to latest revisions in 5.7 branches
qt5: add one more subfolder for ${PN}-qmldesigner
replace base_contains by bb.utils.contains
qt5: upgrade to latest revision in 5.6 branch
qt5: set SRCREVs,PVs to 5.6.0
qtquickcontrols: fix compilation of examples/texteditor
qtdeclarative: fix compilation of examples/qquickviewcomparison
quazip: update to 0.7.2
qtquickcontrols2: initial add 5.6.0
qmake5_base: use remove-libtool bbclass
recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF
qtwebengine: enable ARMv7VE support
Add .gitignore to ignore .pyc/.pyo files
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
7 files changed, 24 insertions, 45 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index a6972fca..5fd3f06a 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From aab168c504038c7573f72e082a2431bc0502efd9 Mon Sep 17 00:00:00 2001 | 1 | From 66af547c2b3ed473b81421aa239d931d364f644d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH 1/2] <chromium> base.gypi: include | 4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc |
5 | atomicops_internals_x86_gcc.cc when building for x64 arch | 5 | when building for x64 arch |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi |
13 | index be4e87c..5434828 100644 | 13 | index 63c3f76..331c975 100644 |
14 | --- a/src/3rdparty/chromium/base/base.gypi | 14 | --- a/src/3rdparty/chromium/base/base.gypi |
15 | +++ b/src/3rdparty/chromium/base/base.gypi | 15 | +++ b/src/3rdparty/chromium/base/base.gypi |
16 | @@ -787,7 +787,7 @@ | 16 | @@ -801,7 +801,7 @@ |
17 | ['include', '^nix/'], | 17 | ['include', '^nix/'], |
18 | ], | 18 | ], |
19 | }], | 19 | }], |
@@ -22,6 +22,3 @@ index be4e87c..5434828 100644 | |||
22 | 'sources/': [ | 22 | 'sources/': [ |
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | ||
26 | 2.7.0 | ||
27 | |||
diff --git a/recipes-qt/qt5/qtwebengine/0001-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 9aa061d0..287bf2b1 100644 --- a/recipes-qt/qt5/qtwebengine/0001-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,7 +1,7 @@ | |||
1 | From 33fac625554652e137c9fb095425c25240ee83ae Mon Sep 17 00:00:00 2001 | 1 | From d28e6ef9c684a7f8f59995995b5cb5a0b1791ee1 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
5 | anywhere in path, but at the end | 5 | anywhere in path, but at the end |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 2f7cd39..6ae413a 100644 | 13 | index 26db26f..277bf98 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -131,9 +131,9 @@ defineReplace(mocOutput) { | 16 | @@ -168,9 +168,9 @@ defineReplace(mocOutput) { |
17 | out = $$1 | 17 | out = $$1 |
18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
@@ -25,6 +25,3 @@ index 2f7cd39..6ae413a 100644 | |||
25 | return($$out) | 25 | return($$out) |
26 | } | 26 | } |
27 | 27 | ||
28 | -- | ||
29 | 2.7.1 | ||
30 | |||
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 94eaf86a..d5ed1ab7 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c3805244c812f4dbfb8949dc2f146aa5c7af62df Mon Sep 17 00:00:00 2001 | 1 | From e40a18da9631fa21202836caf69b3343e8bae973 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 | 3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 |
4 | Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX | 4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX |
5 | qtwebengine compile | 5 | qtwebengine compile |
6 | 6 | ||
7 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | 7 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> |
@@ -61,6 +61,3 @@ index 8a08fe0..32b2a05 100644 | |||
61 | 61 | ||
62 | // we want to always get RGB data out | 62 | // we want to always get RGB data out |
63 | switch (cinfo.jpeg_color_space) { | 63 | switch (cinfo.jpeg_color_space) { |
64 | -- | ||
65 | 2.7.0 | ||
66 | |||
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 index 3662c441..38e97d19 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 958e5875c25f76e7431c86286305f289effcedf6 Mon Sep 17 00:00:00 2001 | 1 | From 9f314e95248795bcce787f88bce77ba6058b34c7 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to |
5 | generate it's moc'ed abbreviation | 5 | generate it's moc'ed abbreviation |
6 | 6 | ||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 7 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 6ae413a..deaab83 100644 | 14 | index 277bf98..d263be4 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |
@@ -24,6 +24,3 @@ index 6ae413a..deaab83 100644 | |||
24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
27 | -- | ||
28 | 2.7.1 | ||
29 | |||
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 index b3f83a39..e0410638 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4c5dd531c728384326c0875661b77d2f9d0faf19 Mon Sep 17 00:00:00 2001 | 1 | From 617028757a9afd334a0938e617429cca78363d69 Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | 7 | ||
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index deaab83..68cdb71 100644 | 15 | index d263be4..879287a 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { |
@@ -28,6 +28,3 @@ index deaab83..68cdb71 100644 | |||
28 | } else:win32 { | 28 | } else:win32 { |
29 | winrt { | 29 | winrt { |
30 | skipBuild("WinRT is not supported.") | 30 | skipBuild("WinRT is not supported.") |
31 | -- | ||
32 | 2.7.1 | ||
33 | |||
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index e4dcbebc..0a708aff 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 35afd225b448d2641594f2fd7e31c423cc64ecae Mon Sep 17 00:00:00 2001 | 1 | From d084661f50dbdc6a4014f9a2181462bba770437f Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor |
5 | 5 | ||
6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | 6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
12 | index e4313a4..5a8137e 100644 | 12 | index 892e99c..a4429d5 100644 |
13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
15 | @@ -59,6 +59,8 @@ | 15 | @@ -60,6 +60,8 @@ |
16 | #include <QString> | 16 | #include <QString> |
17 | #include <QtCore/qcompilerdetection.h> | 17 | #include <QtCore/qcompilerdetection.h> |
18 | #include <QtGui/qaccessibleobject.h> | 18 | #include <QtGui/qaccessibleobject.h> |
@@ -21,6 +21,3 @@ index e4313a4..5a8137e 100644 | |||
21 | 21 | ||
22 | namespace QtWebEngineCore { | 22 | namespace QtWebEngineCore { |
23 | class WebContentsAdapter; | 23 | class WebContentsAdapter; |
24 | -- | ||
25 | 2.7.1 | ||
26 | |||
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index dfd8e25c..3a97a4ae 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1ad078e7cb9d8fff66f05e828953a2f5b11df7ee Mon Sep 17 00:00:00 2001 | 1 | From 0999fbfe32480e737f23ed8fce8f35897b97c20a Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() | 4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() |
5 | 5 | ||
6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | 6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> |
7 | --- | 7 | --- |
@@ -21,6 +21,3 @@ index b13a9da..8a54cce 100644 | |||
21 | #include "web_contents_adapter_client.h" | 21 | #include "web_contents_adapter_client.h" |
22 | 22 | ||
23 | #include "base/callback.h" | 23 | #include "base/callback.h" |
24 | -- | ||
25 | 2.7.1 | ||
26 | |||