diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
| commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
| tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |
| parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
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 | 13 |
1 files changed, 5 insertions, 8 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 4807df09..a35b6a2a 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,7 +1,7 @@ -From db746d1ca0c41fe3da103d09fc240a0df9db5404 Mon Sep 17 00:00:00 2001 +From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 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 04/10] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -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 f62b6bb..91be8b3 100644 +index 75b84ff..ab36fa6 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { +@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { QTPLUGIN = $$manualplugs $$autoplugs } @@ -92,7 +92,7 @@ index f62b6bb..91be8b3 100644 contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 38602f6..f9c401f 100644 +index cc8ed87..b7d4be2 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { @@ -104,6 +104,3 @@ index 38602f6..f9c401f 100644 } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace --- -2.7.1 - |