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/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |
parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) |
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/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | 15 |
1 files changed, 6 insertions, 9 deletions
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?= <schnitzeltony@googlemail.com> 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 <schnitzeltony@googlemail.com> 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 - |