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/qtdeclarative | |
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/qtdeclarative')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch (renamed from recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch) | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index b3f7621c..ee568200 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1755b8c7ab87f9e6bf072bd0bef50086c14dd9ff Mon Sep 17 00:00:00 2001 | 1 | From d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
@@ -83,6 +83,3 @@ index 1bb913e..56f2dd5 100644 | |||
83 | CONFIG += no_import_scan | 83 | CONFIG += no_import_scan |
84 | 84 | ||
85 | load(qt_tool) | 85 | load(qt_tool) |
86 | -- | ||
87 | 2.7.0 | ||
88 | |||
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch index 1687fbe5..60c9685f 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1cdd3278a0b1508640d983720782d39eb919caaf Mon Sep 17 00:00:00 2001 | 1 | From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | 3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 |
4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | 4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been |
@@ -23,6 +23,3 @@ index 5b86c93..e77514e 100644 | |||
23 | 23 | ||
24 | QT_FORWARD_DECLARE_CLASS(QRadioButton) | 24 | QT_FORWARD_DECLARE_CLASS(QRadioButton) |
25 | QT_FORWARD_DECLARE_CLASS(QCheckBox) | 25 | QT_FORWARD_DECLARE_CLASS(QCheckBox) |
26 | -- | ||
27 | 2.2.0 | ||
28 | |||