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/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.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/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 1e701c7d..21e0987b 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d750936020f354b8c59bbfcbf3930115c390d36d Mon Sep 17 00:00:00 2001 | 1 | From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build |
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
20 | 2 files changed, 3 insertions(+), 1 deletion(-) | 20 | 2 files changed, 3 insertions(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/configure b/configure | 22 | diff --git a/configure b/configure |
23 | index 3f05383..05ae996 100755 | 23 | index bd43281..5d1b3aa 100755 |
24 | --- a/configure | 24 | --- a/configure |
25 | +++ b/configure | 25 | +++ b/configure |
26 | @@ -3718,7 +3718,7 @@ setBootstrapEvalVariable() | 26 | @@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() |
27 | 27 | ||
28 | 28 | ||
29 | # build qmake | 29 | # build qmake |
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644 | |||
46 | VPATH += \ | 46 | VPATH += \ |
47 | ../src/corelib/global \ | 47 | ../src/corelib/global \ |
48 | -- | 48 | -- |
49 | 2.1.1 | 49 | 2.1.3 |
50 | 50 | ||