diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 20:58:35 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 21:01:43 +0100 |
commit | ca1042b8feb8cac2ac1ca835ac67d0ad6d373d0c (patch) | |
tree | f665add1e78a6343d66fc263d4405d39112749fc /recipes-qt/qt5/qtwebengine | |
parent | acbb72d884aecb02de29006081fa55efe8cac9f8 (diff) | |
download | meta-qt5-ca1042b8feb8cac2ac1ca835ac67d0ad6d373d0c.tar.gz |
qtwebengine: fix executing config tests instead of ignoring libcap test failure
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch b/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch deleted file mode 100644 index 71ee4fe7..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 27 Feb 2015 19:51:55 +0100 | ||
4 | Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | tools/qmake/mkspecs/features/configure.prf | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf | ||
12 | index 6e74b55..b91fde8 100644 | ||
13 | --- a/tools/qmake/mkspecs/features/configure.prf | ||
14 | +++ b/tools/qmake/mkspecs/features/configure.prf | ||
15 | @@ -20,7 +20,7 @@ defineTest(runConfigure) { | ||
16 | qtCompileTest($$test) | ||
17 | } | ||
18 | # libcap-dev package doesn't ship .pc files on Ubuntu. | ||
19 | - linux:!config_libcap:skipBuild("libcap appears to be missing") | ||
20 | + #linux:!config_libcap:skipBuild("libcap appears to be missing") | ||
21 | contains(QT_CONFIG, xcb) { | ||
22 | for(package, $$list("libdrm xcomposite xi xrandr")) { | ||
23 | !packagesExist($$package):skipBuild("Unmet dependency: $$package") | ||
24 | -- | ||
25 | 2.3.1 | ||
26 | |||