From e088f366191f9a4cadc815c3d72d85086619a184 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Feb 2016 21:38:28 +0100 Subject: qt5: upgrade to latest revisions in 5.7 branches Signed-off-by: Martin Jansa --- .../qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 4 ++-- .../0002-assistant-help-fix-linking-of-dependent-libraries.patch | 4 ++-- recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | 4 ++-- .../0004-linguist-tools-cmake-allow-overriding-the-location-f.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes-qt/qt5/qttools') 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 717f3af1..bc902d30 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 @@ -From 3bd799c512d03bcef2f7c0e3db7b12e0579aa53b Mon Sep 17 00:00:00 2001 +From 412772782e0e4882adb358eabd04fdd2a2166366 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert @@ -157,5 +157,5 @@ index 20b5fec..8a42d1f 100644 installed_cmake.depends = cmake -- -2.7.0 +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 f7dd1797..c8c21265 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 59f4367fc7cd378727a5569bd7babfb8b83bc8d2 Mon Sep 17 00:00:00 2001 +From 431db9926107563b44e2443cb8da8e0b1278a18c 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 @@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.7.0 +2.7.1 diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index b1b9efbf..d926cd11 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 @@ -From 80409fd5fcdf8dfc61e8c9007286a292a195051d Mon Sep 17 00:00:00 2001 +From a06e526751f430de47e32a39dde16559d3378845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/4] add noqtwebkit configuration @@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.7.0 +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 2eed34b5..79339b0e 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,4 +1,4 @@ -From 69a2d2bef3605edb34da7f56a51e5fff50ef3191 Mon Sep 17 00:00:00 2001 +From 7f176e511dfc24bdca2ef2ef7f71afe3177a6ce6 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for @@ -59,5 +59,5 @@ index 4318b16..2e3b70f 100644 set_target_properties(Qt5::lconvert PROPERTIES -- -2.7.0 +2.7.1 -- cgit v1.2.3-54-g00ecf