diff options
Diffstat (limited to 'recipes-qt/qt5/qttools')
4 files changed, 12 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 45a4fc73..dbb94381 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 a6f3bde30cb78e109a26fec6b336f8a504d4fa3c Mon Sep 17 00:00:00 2001 +From c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 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 @@ -156,6 +156,3 @@ index 20b5fec..8a42d1f 100644 installed_cmake.depends = cmake --- -2.7.0 - 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 - diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 81b511f4..f0f40b7a 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 a0637f231d513dfc15f1eec185d5d5e7fb03e292 Mon Sep 17 00:00:00 2001 +From b77f225e25360832074692681c5ff7c13862102d 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.0 - 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 0e7061a9..16ff71e4 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 3f1754dec603e3508a45f3e1800edf0a44411084 Mon Sep 17 00:00:00 2001 +From e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f 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.0 - |