diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-27 13:48:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:06:30 +0100 |
commit | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch) | |
tree | 479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |
parent | 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff) | |
download | meta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz |
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
year update in chromium's LICENSE
< // Copyright (c) 2013 The Chromium Authors. All rights reserved.
and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
it was including also few #include lines which were changed recently
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index b5b77464..83694b7d 100644 --- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e74a3790f613771099e3373f8e6df506c3520b73 Mon Sep 17 00:00:00 2001 | 1 | From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff 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/11] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with |
@@ -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 6e0f4da..d72c302 100644 | 14 | index d0a62c8..b3f3ff8 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 | @@ -3383,8 +3383,8 @@ void Configure::generateQConfigPri() | 17 | @@ -3384,8 +3384,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 6e0f4da..d72c302 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.1.1 | 29 | 2.1.3 |
30 | 30 | ||