diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-24 15:01:56 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-25 11:56:33 +0200 |
commit | 44d180c09346cb5b04636e19a41a7f0cc3b3c32e (patch) | |
tree | 1f1d8b4daf6b1f964df7c87207a77e13f2659c84 /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |
parent | 40b7a93a3c6cf05136c606824c1cea848b75bcb6 (diff) | |
download | meta-qt5-44d180c09346cb5b04636e19a41a7f0cc3b3c32e.tar.gz |
qtbase: refresh patches
* based on b5.5.0 branches in https://github.com/meta-qt5/qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 | 16 |
1 files changed, 8 insertions, 8 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 4a8cdbbd..c44611d5 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 d2212dd3c5acf7d3541f19470e688095a20d956c Mon Sep 17 00:00:00 2001 | 1 | From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 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: Add -external-hostbindir option | 4 | Subject: [PATCH 03/10] 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 |
@@ -37,7 +37,7 @@ Conflicts: | |||
37 | 7 files changed, 37 insertions(+), 12 deletions(-) | 37 | 7 files changed, 37 insertions(+), 12 deletions(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index 43c4dab..ffb69df 100755 | 40 | index dfbb111..548dd0d 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= | 43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= |
@@ -77,7 +77,7 @@ index 43c4dab..ffb69df 100755 | |||
77 | Configure options: | 77 | Configure options: |
78 | 78 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -3095,6 +3104,11 @@ fi | 80 | @@ -3097,6 +3106,11 @@ fi |
81 | # command line and environment validation | 81 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
83 | 83 | ||
@@ -125,7 +125,7 @@ index 1d3e88c..9b26adf 100644 | |||
125 | 125 | ||
126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) |
127 | diff --git a/qtbase.pro b/qtbase.pro | 127 | diff --git a/qtbase.pro b/qtbase.pro |
128 | index 51e8fb8..9806769 100644 | 128 | index 24d0f52..d3d79b3 100644 |
129 | --- a/qtbase.pro | 129 | --- a/qtbase.pro |
130 | +++ b/qtbase.pro | 130 | +++ b/qtbase.pro |
131 | @@ -37,12 +37,16 @@ CONFIG -= qt | 131 | @@ -37,12 +37,16 @@ CONFIG -= qt |
@@ -148,7 +148,7 @@ index 51e8fb8..9806769 100644 | |||
148 | } | 148 | } |
149 | INSTALLS += qmake | 149 | INSTALLS += qmake |
150 | 150 | ||
151 | @@ -54,6 +58,9 @@ exists($$licheck.files): INSTALLS += licheck | 151 | @@ -54,6 +58,9 @@ licheck.files = $$PWD/bin/$$QT_LICHECK |
152 | #syncqt | 152 | #syncqt |
153 | syncqt.path = $$[QT_HOST_BINS] | 153 | syncqt.path = $$[QT_HOST_BINS] |
154 | syncqt.files = $$PWD/bin/syncqt.pl | 154 | syncqt.files = $$PWD/bin/syncqt.pl |
@@ -159,7 +159,7 @@ index 51e8fb8..9806769 100644 | |||
159 | 159 | ||
160 | # If we are doing a prefix build, create a "module" pri which enables | 160 | # If we are doing a prefix build, create a "module" pri which enables |
161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
162 | index 48d5f21..6482022 100644 | 162 | index 65fd1f9..457518b 100644 |
163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
225 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
226 | 226 | ||
227 | -- | 227 | -- |
228 | 2.2.2 | 228 | 2.5.0 |
229 | 229 | ||