diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-19 14:22:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:47 +0000 |
commit | 1f71583dacaf2abde4930815b3415c3af104f514 (patch) | |
tree | 205b617c5ad55675e2a050ace6c933e29d30ecf2 /meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | |
parent | 4e2de8f749103a54d51f627e75401b70bb41d47c (diff) | |
download | poky-1f71583dacaf2abde4930815b3415c3af104f514.tar.gz |
qt4: remove 4.8.1
(From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch deleted file mode 100644 index 859a037aa8..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 96bee73bdf663ddeb2a5d48cab9c5e4df65ba295 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 1 May 2012 07:48:15 +0200 | ||
4 | Subject: [PATCH 03/22] webkit2: set OUTPUT_DIR value if empty | ||
5 | |||
6 | Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem | ||
7 | now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl | ||
8 | |||
9 | First reported here: | ||
10 | http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | ||
20 | index 006a88c..5e17193 100644 | ||
21 | --- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | ||
22 | +++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | ||
23 | @@ -3,6 +3,8 @@ TARGET = dummy | ||
24 | |||
25 | CONFIG -= debug_and_release | ||
26 | |||
27 | +isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. | ||
28 | + | ||
29 | CONFIG(standalone_package) { | ||
30 | isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated | ||
31 | isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated | ||
32 | -- | ||
33 | 1.7.12 | ||
34 | |||