summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-09-29 05:48:44 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-04 04:25:11 +0200
commitbe2d4815efd7b8312700a426a5cafcd86a93666b (patch)
treeef3c3ed2e3092535fe0e4a14d2834c1ccbd72d19 /recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
parent096112d4ab8bad1c45ab0bc40354d9a9bb3e097d (diff)
downloadmeta-qt5-be2d4815efd7b8312700a426a5cafcd86a93666b.tar.gz
qt5: upgrade git recipes to 5.4-alpha1
* introduce 2nd set of qtwayland and qtwebengine recipes, because newer revision isn't compatible with 5.3.2 release Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 182de79d..d1ec16ce 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
1From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001 1From fcbe3eefa24348cbf98ca9fc9e137ac6ccaf1f87 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
67 2 files changed, 16 insertions(+), 1 deletion(-) 67 2 files changed, 16 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index 4dcabe9..d04bc3e 100644 70index ebc5f00..46319d8 100644
71--- a/mkspecs/features/qt_common.prf 71--- a/mkspecs/features/qt_common.prf
72+++ b/mkspecs/features/qt_common.prf 72+++ b/mkspecs/features/qt_common.prf
73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { 73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,7 +80,7 @@ index 4dcabe9..d04bc3e 100644
80 lib_replace.CONFIG = path 80 lib_replace.CONFIG = path
81 QMAKE_PRL_INSTALL_REPLACE += lib_replace 81 QMAKE_PRL_INSTALL_REPLACE += lib_replace
82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
83index 8bf4c92..ee2e989 100644 83index 6ab8267..2b4943c 100644
84--- a/mkspecs/features/qt_module.prf 84--- a/mkspecs/features/qt_module.prf
85+++ b/mkspecs/features/qt_module.prf 85+++ b/mkspecs/features/qt_module.prf
86@@ -188,10 +188,25 @@ unix|mingw { 86@@ -188,10 +188,25 @@ unix|mingw {
@@ -110,5 +110,5 @@ index 8bf4c92..ee2e989 100644
110 } 110 }
111 111
112-- 112--
1132.0.0 1132.1.1
114 114