diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 87e8f0f3..ff269677 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001 | 1 | From 6c015d77a95910deec0a8c4a265587578531b476 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, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/11] Add -external-hostbindir option | 4 | Subject: [PATCH 03/13] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -31,10 +31,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
31 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | 31 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
32 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 32 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
33 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 33 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
34 | 11 files changed, 50 insertions(+), 13 deletions(-) | 34 | 7 files changed, 38 insertions(+), 12 deletions(-) |
35 | 35 | ||
36 | diff --git a/configure b/configure | 36 | diff --git a/configure b/configure |
37 | index b7a6fe3..d715f6c 100755 | 37 | index 0bcc175..996ce50 100755 |
38 | --- a/configure | 38 | --- a/configure |
39 | +++ b/configure | 39 | +++ b/configure |
40 | @@ -769,6 +769,7 @@ QT_HOST_BINS= | 40 | @@ -769,6 +769,7 @@ QT_HOST_BINS= |
@@ -95,10 +95,10 @@ index b7a6fe3..d715f6c 100755 | |||
95 | "qt_hostspec=$shortspec", | 95 | "qt_hostspec=$shortspec", |
96 | #endif | 96 | #endif |
97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
98 | index a9a622d..b6f1db0 100644 | 98 | index 7961f65..e11b23d 100644 |
99 | --- a/mkspecs/features/qt_functions.prf | 99 | --- a/mkspecs/features/qt_functions.prf |
100 | +++ b/mkspecs/features/qt_functions.prf | 100 | +++ b/mkspecs/features/qt_functions.prf |
101 | @@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { | 101 | @@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) { |
102 | defineTest(qtPrepareTool) { | 102 | defineTest(qtPrepareTool) { |
103 | cmd = $$eval(QT_TOOL.$${2}.binary) | 103 | cmd = $$eval(QT_TOOL.$${2}.binary) |
104 | isEmpty(cmd) { | 104 | isEmpty(cmd) { |
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 230 | ||
231 | -- | 231 | -- |
232 | 2.1.3 | 232 | 2.3.1 |
233 | 233 | ||