diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |
parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
download | meta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index 6fd9e499..fa3faf45 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b3f3154e4852a830fdc4e311d4f5105fc337e8f2 Mon Sep 17 00:00:00 2001 | 1 | From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() | 4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() |
5 | 5 | ||
6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | 6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> |
7 | --- | 7 | --- |
@@ -21,6 +21,3 @@ index 500fe76..eda2824 100644 | |||
21 | #include "web_contents_adapter_client.h" | 21 | #include "web_contents_adapter_client.h" |
22 | 22 | ||
23 | #include "base/callback.h" | 23 | #include "base/callback.h" |
24 | -- | ||
25 | 2.7.0 | ||
26 | |||