diff options
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 @@ | |||
1 | From db746d1ca0c41fe3da103d09fc240a0df9db5404 Mon Sep 17 00:00:00 2001 | 1 | From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 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 04/10] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH] 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 |
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
68 | 2 files changed, 14 insertions(+), 1 deletion(-) | 68 | 2 files changed, 14 insertions(+), 1 deletion(-) |
69 | 69 | ||
70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
71 | index f62b6bb..91be8b3 100644 | 71 | index 75b84ff..ab36fa6 100644 |
72 | --- a/mkspecs/features/qt.prf | 72 | --- a/mkspecs/features/qt.prf |
73 | +++ b/mkspecs/features/qt.prf | 73 | +++ b/mkspecs/features/qt.prf |
74 | @@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { | 74 | @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { |
75 | QTPLUGIN = $$manualplugs $$autoplugs | 75 | QTPLUGIN = $$manualplugs $$autoplugs |
76 | } | 76 | } |
77 | 77 | ||
@@ -92,7 +92,7 @@ index f62b6bb..91be8b3 100644 | |||
92 | contains(QT_CONFIG, static) { | 92 | contains(QT_CONFIG, static) { |
93 | QT_PLUGIN_VERIFY += QTPLUGIN | 93 | QT_PLUGIN_VERIFY += QTPLUGIN |
94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf | 94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf |
95 | index 38602f6..f9c401f 100644 | 95 | index cc8ed87..b7d4be2 100644 |
96 | --- a/mkspecs/features/qt_common.prf | 96 | --- a/mkspecs/features/qt_common.prf |
97 | +++ b/mkspecs/features/qt_common.prf | 97 | +++ b/mkspecs/features/qt_common.prf |
98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { | 98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { |
@@ -104,6 +104,3 @@ index 38602f6..f9c401f 100644 | |||
104 | } | 104 | } |
105 | lib_replace.CONFIG = path | 105 | lib_replace.CONFIG = path |
106 | QMAKE_PRL_INSTALL_REPLACE += lib_replace | 106 | QMAKE_PRL_INSTALL_REPLACE += lib_replace |
107 | -- | ||
108 | 2.7.1 | ||
109 | |||