diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:37:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:23:53 +0200 |
commit | cfe122037d04fb78a8a21f7936e6822170916246 (patch) | |
tree | 286e3ec9aba1603aa77edbfde756998ef7798170 /recipes-qt/qt5/qttools | |
parent | 3700c51c246f6aaf8ef6a3ce098578664873c096 (diff) | |
download | meta-qt5-cfe122037d04fb78a8a21f7936e6822170916246.tar.gz |
qt*: refresh the patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools')
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index e668edd9..5cebe258 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f4eb217f9b706a13e7f8256b8540970cfc78d805 Mon Sep 17 00:00:00 2001 | 1 | From 7bd3f1feea0ec1121a73faa1214e72702954b317 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert |
@@ -150,5 +150,5 @@ index c3acfe3..f2f88f7 100644 | |||
150 | installed_cmake.depends = cmake | 150 | installed_cmake.depends = cmake |
151 | 151 | ||
152 | -- | 152 | -- |
153 | 2.0.0 | 153 | 2.1.1 |
154 | 154 | ||
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index 042605c3..d25904e6 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2b9829a4aa1379a69343371991a81b3769ac7dec Mon Sep 17 00:00:00 2001 | 1 | From a74f00b2a64dde326a78f7523f875d7e14ee45f5 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 2.0.0 | 31 | 2.1.1 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index fa3ac1a4..98a0bc69 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001 | 1 | From 7388296f5219725801aeb9d8b0a2f4ba01a7ca6d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH 3/3] add noqtwebkit configuration | 4 | Subject: [PATCH 3/3] add noqtwebkit configuration |
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 | |||
47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | 47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |
48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget | 48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget |
49 | -- | 49 | -- |
50 | 2.0.4 | 50 | 2.1.1 |
51 | 51 | ||