summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-14 18:37:41 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:16:18 +0200
commitbf2cafa909a27250f853a823e9d7101307337e7a (patch)
tree3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
parentc1b0c9f546289b1592d7a895640de103723a0305 (diff)
downloadmeta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available * it's highly recommended to read: http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ to find out how you're affected check which files/tools are included in your builds, e.g. for qtwebengine: OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c 11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$ 67 ** $QT_BEGIN_LICENSE:BSD$ 17 ** $QT_BEGIN_LICENSE:FDL$ 61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ 261 ** $QT_BEGIN_LICENSE:LGPL$ * change in chromium's LICENSE is only copyright year update 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.patch6
1 files changed, 3 insertions, 3 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 fa3faf45..3a97a4ae 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,4 +1,4 @@
1From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001 1From 0999fbfe32480e737f23ed8fce8f35897b97c20a Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h 11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index 500fe76..eda2824 100644 12index b13a9da..8a54cce 100644
13--- a/src/core/media_capture_devices_dispatcher.h 13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h 14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -43,6 +43,8 @@ 15@@ -46,6 +46,8 @@
16 #include <map> 16 #include <map>
17 #include <QtCore/qcompilerdetection.h> 17 #include <QtCore/qcompilerdetection.h>
18 18