From 754aaadc7f0a1c98a4895899617afbaef0f1cdfa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Apr 2016 11:38:06 +0200 Subject: 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 --- .../0001-qmltestexample-fix-link.patch | 5 +--- ...omparison-fix-QCoreApplication-has-not-be.patch | 28 ---------------------- ...omparison-fix-QCoreApplication-has-not-be.patch | 25 +++++++++++++++++++ 3 files changed, 26 insertions(+), 32 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch (limited to 'recipes-qt/qt5/qtdeclarative') 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 @@ -From 1755b8c7ab87f9e6bf072bd0bef50086c14dd9ff Mon Sep 17 00:00:00 2001 +From d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH] qmltestexample: fix link @@ -83,6 +83,3 @@ index 1bb913e..56f2dd5 100644 CONFIG += no_import_scan load(qt_tool) --- -2.7.0 - diff --git a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch deleted file mode 100644 index 1687fbe5..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1cdd3278a0b1508640d983720782d39eb919caaf Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Thu, 31 Mar 2016 19:38:58 -0400 -Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been - declared error - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko ---- - examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -index 5b86c93..e77514e 100644 ---- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - QT_FORWARD_DECLARE_CLASS(QRadioButton) - QT_FORWARD_DECLARE_CLASS(QCheckBox) --- -2.2.0 - diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch new file mode 100644 index 00000000..60c9685f --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch @@ -0,0 +1,25 @@ +From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Thu, 31 Mar 2016 19:38:58 -0400 +Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been + declared error + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko +--- + examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h +index 5b86c93..e77514e 100644 +--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h ++++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + QT_FORWARD_DECLARE_CLASS(QRadioButton) + QT_FORWARD_DECLARE_CLASS(QCheckBox) -- cgit v1.2.3-54-g00ecf