summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-04-16 13:14:57 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-04-29 19:14:51 +0200
commit3ccdc239b02aca03dc1e9316b7c5c870b3b59368 (patch)
treed02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
parentba57f73f349ecb6c03f6281b5a9422e32f29b3fb (diff)
downloadmeta-qt5-3ccdc239b02aca03dc1e9316b7c5c870b3b59368.tar.gz
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance * I plan to apply this to fido branch (as well as final upgrade to 5.4.2 recipes * I'm preparing similar patch for 5.5 revisions, which will be applied only in master branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch')
-rw-r--r--recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
index 6eb4d840..7ceb84a3 100644
--- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From 9868ff8a11f36712f9bc2fe45ad129214994947a Mon Sep 17 00:00:00 2001 1From c9f7a83107d01b30cb150f7783441fe73003cfa1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/3] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.3.1 502.3.5
51 51