diff options
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.patch | 10 |
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 @@ | |||
1 | From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001 | 1 | From fcbe3eefa24348cbf98ca9fc9e137ac6ccaf1f87 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-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 | ||
69 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf | 69 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf |
70 | index 4dcabe9..d04bc3e 100644 | 70 | index 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 |
82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
83 | index 8bf4c92..ee2e989 100644 | 83 | index 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 | -- |
113 | 2.0.0 | 113 | 2.1.1 |
114 | 114 | ||