diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 8a3ef3c1..c1e80bc2 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 | 1 | From fdd0a04cca9cb991b7073d01312218d3387c1e43 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: Sun, 28 Apr 2013 12:56:55 +0200 | 3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 |
4 | Subject: [PATCH 09/15] qt_module: Fix paths in .prl files | 4 | Subject: [PATCH 09/23] qt_module: Fix paths in .prl files |
5 | 5 | ||
6 | * qmake does not prefix them with QT_SYSROOT when using them | 6 | * qmake does not prefix them with QT_SYSROOT when using them |
7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE | 7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE |
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 17 insertions(+), 11 deletions(-) | 19 | 1 file changed, 17 insertions(+), 11 deletions(-) |
20 | 20 | ||
21 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 21 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
22 | index 1c43972..feec2d5 100644 | 22 | index 7741b96..3874067 100644 |
23 | --- a/mkspecs/features/qt_module.prf | 23 | --- a/mkspecs/features/qt_module.prf |
24 | +++ b/mkspecs/features/qt_module.prf | 24 | +++ b/mkspecs/features/qt_module.prf |
25 | @@ -140,17 +140,23 @@ unix|win32-g++* { | 25 | @@ -144,17 +144,23 @@ unix|win32-g++* { |
26 | pkgconfig_include_replace.replace = "\$$\\{includedir}" | 26 | pkgconfig_include_replace.replace = "\$$\\{includedir}" |
27 | pkgconfig_lib_replace.match = $$rplbase/lib | 27 | pkgconfig_lib_replace.match = $$rplbase/lib |
28 | pkgconfig_lib_replace.replace = "\$$\\{libdir}" | 28 | pkgconfig_lib_replace.replace = "\$$\\{libdir}" |
@@ -58,5 +58,5 @@ index 1c43972..feec2d5 100644 | |||
58 | QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | 58 | QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace |
59 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | 59 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace |
60 | -- | 60 | -- |
61 | 1.8.2.1 | 61 | 1.8.3.2 |
62 | 62 | ||