diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-16 22:57:15 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-17 20:42:43 +0200 |
| commit | d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 (patch) | |
| tree | 59316aab5eb11a92368160769ef78545ddab5dfd /recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |
| parent | 1619723dfc0cdc831b71bf7ab09c4227ea544255 (diff) | |
qtbase: refresh the patches
* upload the patches to b5.8* branches on:
https://github.com/meta-qt5/qtbase
* refresh the patches
* notice that some patches were in section which is meant to be
common for target, native and nativesdk qtbase but were added
only in target recipe, I've updated them to be included in all
3, hopefully they can be used in all 3 (I don't use nativesdk at all)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index c105488e..aa97b56f 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,4 +1,4 @@ -From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001 +From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements @@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 0c5f080..a6e4f09 100644 +index 98f794c485..bd8b7b52e4 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { +@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) { QTPLUGIN = $$manualplugs $$autoplugs } @@ -92,7 +92,7 @@ index 0c5f080..a6e4f09 100644 qtConfig(static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index e754a17..4c1530e 100644 +index d30983f62b..6da07e032c 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) { |