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 --- ...pro-use-DEPLOYMENT-only-for-wince-like-ot.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch (limited to 'recipes-qt/qt5/qtsvg') diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch deleted file mode 100644 index c0e13898..00000000 --- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 5 Nov 2015 12:25:05 +0100 -Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other - examples - -Signed-off-by: Martin Jansa ---- - examples/svg/richtext/textobject/textobject.pro | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro -index 794ad32..0ecd2c7 100644 ---- a/examples/svg/richtext/textobject/textobject.pro -+++ b/examples/svg/richtext/textobject/textobject.pro -@@ -12,6 +12,8 @@ RESOURCES = resources.qrc - target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject - INSTALLS += target - --filesToDeploy.files = files/*.svg --filesToDeploy.path = files --DEPLOYMENT += filesToDeploy -+wince* { -+ filesToDeploy.files = files/*.svg -+ filesToDeploy.path = files -+ DEPLOYMENT += filesToDeploy -+} --- -2.7.0 - -- cgit v1.2.3-54-g00ecf