diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
| commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
| tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |
| parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
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 aef49995..e7155bb8 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 bae1b8fbd3fe94a99a02fb751302baa788e9f2ff Mon Sep 17 00:00:00 2001 +From d28d15f9489ab9bb09627014003ad1bde2a79e1f 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 @@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 5861941..474827c 100644 +index 55f65b5..2412fdd 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) { @@ -80,7 +80,7 @@ index 5861941..474827c 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 5412f37..5ab348a 100644 +index c89b6d2..23d4366 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -214,6 +214,11 @@ unix|mingw { @@ -108,5 +108,5 @@ index 5412f37..5ab348a 100644 } -- -2.5.0 +2.5.3 |