diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:37:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:23:53 +0200 |
commit | cfe122037d04fb78a8a21f7936e6822170916246 (patch) | |
tree | 286e3ec9aba1603aa77edbfde756998ef7798170 /recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |
parent | 3700c51c246f6aaf8ef6a3ce098578664873c096 (diff) | |
download | meta-qt5-cfe122037d04fb78a8a21f7936e6822170916246.tar.gz |
qt*: refresh the patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index db6266d0..adf1c4ae 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd Mon Sep 17 00:00:00 2001 | 1 | From 34a32208034a03c0d591dc79386f97ae020652e7 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 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/13] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
@@ -11,10 +11,10 @@ Upstream-Status: Pending | |||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 13 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
14 | index 7e61845..29c6358 100644 | 14 | index 7d73882..c572fbb 100644 |
15 | --- a/tools/configure/configureapp.cpp | 15 | --- a/tools/configure/configureapp.cpp |
16 | +++ b/tools/configure/configureapp.cpp | 16 | +++ b/tools/configure/configureapp.cpp |
17 | @@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() | 17 | @@ -3393,8 +3393,8 @@ void Configure::generateQConfigPri() |
18 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; | 18 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; |
19 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { | 19 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { |
20 | // FIXME: add detection | 20 | // FIXME: add detection |
@@ -26,5 +26,5 @@ index 7e61845..29c6358 100644 | |||
26 | configStream << "}" << endl; | 26 | configStream << "}" << endl; |
27 | configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; | 27 | configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; |
28 | -- | 28 | -- |
29 | 2.0.0 | 29 | 2.1.1 |
30 | 30 | ||