diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2015-02-26 13:30:06 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 17:50:32 +0100 |
| commit | e87cd44fba14319cedd6195a227f468671f568cd (patch) | |
| tree | bd27b930065561b77a14ddb5870da98589066b06 /recipes-qt/qt5/qtwebengine | |
| parent | 085df473cf381e0464d8875a5332aff2d0c44a9f (diff) | |
recipes: upgrade from 5.4.0 to 5.4.1
Signed-off-by: Stephan Binner <stephan.binner@basyskom.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch b/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch new file mode 100644 index 00000000..897e7e54 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch @@ -0,0 +1,13 @@ +diff -u -r1.1 tools/qmake/mkspecs/features/configure.prf +--- a/tools/qmake/mkspecs/features/configure.prf 2015/02/04 10:24:55 1.1 ++++ b/tools/qmake/mkspecs/features/configure.prf 2015/02/04 10:26:52 +@@ -20,7 +20,7 @@ + qtCompileTest($$test) + } + # libcap-dev package doesn't ship .pc files on Ubuntu. +- linux:!config_libcap:skipBuild("libcap appears to be missing") ++ #linux:!config_libcap:skipBuild("libcap appears to be missing") + contains(QT_CONFIG, xcb) { + for(package, $$list("libdrm xcomposite xi xrandr")) { + !packagesExist($$package):skipBuild("Unmet dependency: $$package") + |