From 8cadcbcb52af124417cdc29eb94bf8cdfe86f3d4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 27 Jan 2020 13:37:21 +0100 Subject: qt5: upgrade to 5.14.1 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | 2 +- .../0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | 2 +- .../0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qttools') diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 93a67bf6..d0a9d352 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From a42f74d9572f785489daf2fa3de5f36269e9bfef Mon Sep 17 00:00:00 2001 +From 0835a82c0002bfadb1e3007ae75ad1159aef0906 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] add noqtwebkit configuration diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index d67a1e7e..f8bde420 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From 17e39873d9655339fa32e3b1b29ef2254c52bc2e Mon Sep 17 00:00:00 2001 +From 2d76f5a7770076eccd55dec4a3f1f63b931a566c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Feb 2019 10:45:03 +0200 Subject: [PATCH] linguist-tools cmake: allow overriding the location for diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch index 55c6e22a..06eec226 100644 --- a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch +++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch @@ -1,4 +1,4 @@ -From 623675e07231f62cdc7600dca5897a9fc70e0467 Mon Sep 17 00:00:00 2001 +From ffbd58e5a6c709592fb97a6d033820556b76ab53 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 14 Dec 2019 18:36:49 -0800 Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds @@ -23,6 +23,3 @@ index 5c256ea3..196c34c7 100644 !android|android_app: SUBDIRS += qtpaths --- -2.24.1 - -- cgit v1.2.3