diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine-git')
4 files changed, 0 insertions, 114 deletions
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch deleted file mode 100644 index b4a8852e..00000000 --- a/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | ||
4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | ||
5 | when building for x64 arch | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | chromium/base/base.gypi | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | ||
13 | index a5a990a..af30cfa 100644 | ||
14 | --- a/src/3rdparty/chromium/base/base.gypi | ||
15 | +++ b/src/3rdparty/chromium/base/base.gypi | ||
16 | @@ -745,7 +745,7 @@ | ||
17 | ['include', '^nix/'], | ||
18 | ], | ||
19 | }], | ||
20 | - ['use_qt==1 and target_arch=="ia32"', { | ||
21 | + ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', { | ||
22 | 'sources/': [ | ||
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | ||
24 | ], | ||
25 | -- | ||
26 | 2.3.1 | ||
27 | |||
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch deleted file mode 100644 index 134133b3..00000000 --- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From b6ca6c086aa21985e17d11592a830f18159f1c3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | ||
4 | Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | ||
5 | anywhere in path, but at the end | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | tools/qmake/mkspecs/features/functions.prf | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
13 | index 4c2547d..64c08ad 100644 | ||
14 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
16 | @@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) { | ||
17 | defineReplace(mocOutput) { | ||
18 | out = $$1 | ||
19 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
20 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
21 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
22 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
23 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
24 | return($$out) | ||
25 | } | ||
26 | |||
27 | -- | ||
28 | 2.3.5 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch deleted file mode 100644 index 8d1c5fd1..00000000 --- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From cfe706846298d41defbf0386f85b17e70108b7af Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | ||
4 | Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to | ||
5 | generate it's moc'ed abbreviation | ||
6 | |||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | tools/qmake/mkspecs/features/functions.prf | 3 ++- | ||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
14 | index 64c08ad..b46478b 100644 | ||
15 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
17 | @@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) { | ||
18 | } | ||
19 | |||
20 | defineReplace(mocOutput) { | ||
21 | - out = $$1 | ||
22 | + in = $$1 | ||
23 | + out = $$basename(in) | ||
24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
27 | -- | ||
28 | 2.3.5 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch deleted file mode 100644 index 4e5e4530..00000000 --- a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 9595a2dd48dbf45ba1661cf1fd4d38fac8192a4f Mon Sep 17 00:00:00 2001 | ||
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | ||
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | ||
4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de> | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | tools/qmake/mkspecs/features/functions.prf | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
15 | index b46478b..6205bf4 100644 | ||
16 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
18 | @@ -10,7 +10,7 @@ defineTest(isPlatformSupported) { | ||
19 | |||
20 | linux-g++*:!isGCCVersionSupported(): return(false) | ||
21 | !isPythonVersionSupported(): return(false) | ||
22 | - linux-g++*|win32-msvc2013|macx-clang: return(true) | ||
23 | + linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) | ||
24 | boot2qt: return(true) | ||
25 | |||
26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") | ||
27 | -- | ||
28 | 2.3.5 | ||
29 | |||