diff options
Diffstat (limited to 'recipes-qt/qt5/qttools')
4 files changed, 11 insertions, 24 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 08c86e98..014d572b 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,7 +1,7 @@ -From 412772782e0e4882adb358eabd04fdd2a2166366 Mon Sep 17 00:00:00 2001 +From e80743f15443212823e95d2be82073980a4700bc Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.jansa@gmail.com> Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native is built without GUI support (no-png is set) and we still want to build @@ -158,6 +158,3 @@ index 20b5fec..8a42d1f 100644 installed_cmake.depends = cmake --- -2.7.1 - 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 9edc29a5..fe8fe3d7 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 @@ -From 0f11ccdb0683554595fe7f223071621902c0b315 Mon Sep 17 00:00:00 2001 +From d7943b08bdb858bd2501c93a428ebc13bc9f3cfc 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] assistant/help: fix linking of dependent libraries @@ -18,16 +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 37d5ba4..ca90a68 100644 +index 37d5ba4..8de8763 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro -@@ -59,4 +59,6 @@ HEADERS += qhelpenginecore.h \ - HEADERS += qhelpsearchindexwriter_clucene_p.h \ +@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \ qhelpsearchindexreader_clucene_p.h -+LIBS += -lQt5CLucene -+ load(qt_module) --- -1.9.1 - ++ ++LIBS += -lQt5CLucene diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index d926cd11..aca2fbce 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,7 +1,7 @@ -From a06e526751f430de47e32a39dde16559d3378845 Mon Sep 17 00:00:00 2001 +From 6c5bbd423c3c8f87d00c18384460ab418dccea95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 4 Jun 2014 11:28:16 +0200 -Subject: [PATCH 3/4] add noqtwebkit configuration +Subject: [PATCH] add noqtwebkit configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -46,6 +46,3 @@ index 500a153..b60fa2d 100644 +qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget --- -2.7.1 - diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index 79339b0e..4f599805 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,7 +1,7 @@ -From 7f176e511dfc24bdca2ef2ef7f71afe3177a6ce6 Mon Sep 17 00:00:00 2001 +From 3dfe38ac9b83ee94c8abfe1bb78b14050b0c9a6f Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 9 Jul 2015 11:28:19 -0400 -Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for +Subject: [PATCH] linguist-tools cmake: allow overriding the location for lupdate and lrelease --- @@ -58,6 +58,3 @@ index 4318b16..2e3b70f 100644 _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lconvert PROPERTIES --- -2.7.1 - |