diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-02 11:22:23 +0100 |
| commit | f87ed4bdc60f38a42efdd6a418eb1d5c99933222 (patch) | |
| tree | 30fc197bce059cc74f4eb3c6ea5c7037d1400630 /recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |
| parent | b2d5376b41625521b9a081fe800345fff33d8dd6 (diff) | |
| download | meta-qt5-f87ed4bdc60f38a42efdd6a418eb1d5c99933222.tar.gz | |
qt5: upgrade to latest revisions in 5.7 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index 4a3deb9b..efaabf04 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001 | 1 | From b3c28efd16c9e9a0cd2a29441dae02382b8deaea Mon Sep 17 00:00:00 2001 |
| 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
| 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
| 4 | Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor |
| @@ -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 | ||
| 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
| 12 | index dbbbf91..94268b6 100644 | 12 | index e4313a4..5a8137e 100644 |
| 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
| 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
| 15 | @@ -56,6 +56,8 @@ | 15 | @@ -59,6 +59,8 @@ |
| 16 | #include <QString> | 16 | #include <QString> |
| 17 | #include <QtCore/qcompilerdetection.h> | 17 | #include <QtCore/qcompilerdetection.h> |
| 18 | #include <QtGui/qaccessibleobject.h> | 18 | #include <QtGui/qaccessibleobject.h> |