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/qtsvg | |
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/qtsvg')
-rw-r--r-- | recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch | 30 |
1 files changed, 0 insertions, 30 deletions
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 @@ | |||
1 | From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 5 Nov 2015 12:25:05 +0100 | ||
4 | Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other | ||
5 | examples | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | examples/svg/richtext/textobject/textobject.pro | 8 +++++--- | ||
10 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro | ||
13 | index 794ad32..0ecd2c7 100644 | ||
14 | --- a/examples/svg/richtext/textobject/textobject.pro | ||
15 | +++ b/examples/svg/richtext/textobject/textobject.pro | ||
16 | @@ -12,6 +12,8 @@ RESOURCES = resources.qrc | ||
17 | target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject | ||
18 | INSTALLS += target | ||
19 | |||
20 | -filesToDeploy.files = files/*.svg | ||
21 | -filesToDeploy.path = files | ||
22 | -DEPLOYMENT += filesToDeploy | ||
23 | +wince* { | ||
24 | + filesToDeploy.files = files/*.svg | ||
25 | + filesToDeploy.path = files | ||
26 | + DEPLOYMENT += filesToDeploy | ||
27 | +} | ||
28 | -- | ||
29 | 2.7.0 | ||
30 | |||