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 46616066..a6e90894 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,4 +1,4 @@ | |||
1 | From 9f7dd27bb14cf0c3425c2c8fdec2f6d0df3852f9 Mon Sep 17 00:00:00 2001 | 1 | From 5778f98f990781710e72be8275dae32a7999330d 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/11] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements |
@@ -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 ebc5f00..46319d8 100644 | 70 | index af9d6ca..a4781d6 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,10 +80,10 @@ index ebc5f00..46319d8 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 8599a47..7da73a6 100644 | 83 | index d213f9e..915c596 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 | @@ -190,10 +190,25 @@ unix|mingw { | 86 | @@ -192,10 +192,25 @@ unix|mingw { |
87 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module | 87 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module |
88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace | 88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace |
89 | 89 | ||
@@ -110,5 +110,5 @@ index 8599a47..7da73a6 100644 | |||
110 | } | 110 | } |
111 | 111 | ||
112 | -- | 112 | -- |
113 | 2.1.1 | 113 | 2.1.3 |
114 | 114 | ||