diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
| commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
| tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qttools | |
| parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools')
| -rw-r--r-- | recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | 6 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 7549ce9c..1ae99edc 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 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001 +From 75570ed9ac805373478fdc76cecca8bdaae3bc97 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] add noqtwebkit configuration @@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 82f55092..ef07ee03 100644 +index 1374c07..28c45a2 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ @@ -35,7 +35,7 @@ index 82f55092..ef07ee03 100644 QT += webkitwidgets SOURCES += helpviewer_qwv.cpp diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a1534..b60fa2d9 100644 +index 500a153..b60fa2d 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro @@ -1,6 +1,6 @@ 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 80f2ae73..99498c75 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 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001 +From 3a4fec39855d0e3bb694917658393bae2cfb1bda 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] linguist-tools cmake: allow overriding the location for @@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16f..2e3b70fa 100644 +index 4318b16..2e3b70f 100644 --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in @@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ |