diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qttools | |
parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name 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 (renamed from recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch) | 14 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch (renamed from recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch) | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 88c39c74..ed25390b 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001 +From e0387540876944a20461d60d2208191c734e00b1 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,16 +16,16 @@ 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 ef5c595..9c2dc1c 100644 +index 540c9689..2312b521 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ --qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { -+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { +-false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { + # FIXME: currently broken BROWSER = qtwebkit } else { - BROWSER = qtextbrowser -@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ +@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ openpagesmanager.cpp \ openpagesswitcher.cpp @@ -35,7 +35,7 @@ index ef5c595..9c2dc1c 100644 QT += webkitwidgets SOURCES += helpviewer_qwv.cpp diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a153..b60fa2d 100644 +index 500a1534..b60fa2d9 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/0004-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 1a201de9..b2e017eb 100644 --- a/recipes-qt/qt5/qttools/0004-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 f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001 +From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 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 4318b16..2e3b70f 100644 +index 4318b16f..2e3b70fa 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_ |