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 --- ...ssistant-help-fix-linking-of-dependent-libraries.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch') 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 c4c0a14d..b5e92934 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,7 +1,7 @@ -From 1140fd4bb5768d49cad9e834a9ce5eb05b711d0e Mon Sep 17 00:00:00 2001 +From 34f23c43f1c656ccd424528821a9ac65a98c5fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jan 2014 14:33:19 +0100 -Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries +Subject: [PATCH] assistant/help: fix linking of dependent libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,15 +18,12 @@ Signed-off-by: Andreas Müller 1 file changed, 2 insertions(+) diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro -index 168d23d..a9c3b59 100644 +index 37d5ba4..8de8763 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro -@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \ - # access to clucene - HEADERS += qhelpsearchindexwriter_clucene_p.h \ +@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \ qhelpsearchindexreader_clucene_p.h + + load(qt_module) + +LIBS += -lQt5CLucene --- -2.7.0 - -- cgit v1.2.3-54-g00ecf