diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:16:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:22:05 +0200 |
commit | 35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch) | |
tree | d640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |
parent | 81b7031859176f24c028c7234d795812bd1a3c95 (diff) | |
download | meta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz |
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
used in recipes
* 0004-Disable-mkv8snapshot.patch and
0005-AddSynchoronization-qimagereader.patch are special, because they
are applied only to 5.0.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index e1c56ac3..2a64291a 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |||
@@ -1,13 +1,15 @@ | |||
1 | From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001 | 1 | From c9bf00e21ae398575adf4411e67b35cdf44920e5 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/12] 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 |
8 | 8 | ||
9 | * this way we can skip bootstraping tools we already have | 9 | * this way we can skip bootstraping tools we already have |
10 | 10 | ||
11 | Upstream-Status: Pending | ||
12 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
12 | --- | 14 | --- |
13 | configure | 15 ++++++++++++++- | 15 | configure | 15 ++++++++++++++- |
@@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644 | |||
156 | 158 | ||
157 | # If we are doing a prefix build, create a "module" pri which enables | 159 | # If we are doing a prefix build, create a "module" pri which enables |
158 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 160 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
159 | index acd11f5..bba0861 100644 | 161 | index 6b40731..139a60f 100644 |
160 | --- a/src/corelib/global/qlibraryinfo.cpp | 162 | --- a/src/corelib/global/qlibraryinfo.cpp |
161 | +++ b/src/corelib/global/qlibraryinfo.cpp | 163 | +++ b/src/corelib/global/qlibraryinfo.cpp |
162 | @@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() | 164 | @@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() |
163 | */ | 165 | */ |
164 | 166 | ||
165 | static const struct { | 167 | static const struct { |
@@ -168,7 +170,7 @@ index acd11f5..bba0861 100644 | |||
168 | } qtConfEntries[] = { | 170 | } qtConfEntries[] = { |
169 | { "Prefix", "." }, | 171 | { "Prefix", "." }, |
170 | { "Documentation", "doc" }, // should be ${Data}/doc | 172 | { "Documentation", "doc" }, // should be ${Data}/doc |
171 | @@ -297,6 +297,7 @@ static const struct { | 173 | @@ -295,6 +295,7 @@ static const struct { |
172 | { "HostPrefix", "" }, | 174 | { "HostPrefix", "" }, |
173 | { "HostBinaries", "bin" }, | 175 | { "HostBinaries", "bin" }, |
174 | { "HostData", "." }, | 176 | { "HostData", "." }, |