diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |
parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 81b511f4..f0f40b7a 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,7 +1,7 @@ -From a0637f231d513dfc15f1eec185d5d5e7fb03e292 Mon Sep 17 00:00:00 2001 +From b77f225e25360832074692681c5ff7c13862102d 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 3/4] add noqtwebkit configuration +Subject: [PATCH] add noqtwebkit configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -46,6 +46,3 @@ index 500a153..b60fa2d 100644 +qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget --- -2.7.0 - |