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/0001-add-noqtwebkit-configuration.patch | |
parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
download | meta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz |
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/0001-add-noqtwebkit-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch new file mode 100644 index 00000000..ed25390b --- /dev/null +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | ||
4 | Subject: [PATCH] add noqtwebkit configuration | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropiate [configuration] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | src/assistant/assistant/assistant.pro | 4 ++-- | ||
15 | src/designer/src/plugins/plugins.pro | 2 +- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro | ||
19 | index 540c9689..2312b521 100644 | ||
20 | --- a/src/assistant/assistant/assistant.pro | ||
21 | +++ b/src/assistant/assistant/assistant.pro | ||
22 | @@ -1,4 +1,4 @@ | ||
23 | -false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | ||
24 | +false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { | ||
25 | # FIXME: currently broken | ||
26 | BROWSER = qtwebkit | ||
27 | } else { | ||
28 | @@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ | ||
29 | openpagesmanager.cpp \ | ||
30 | openpagesswitcher.cpp | ||
31 | |||
32 | -equals(BROWSER, "qtwebkit") { | ||
33 | +equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { | ||
34 | DEFINES += BROWSER_QTWEBKIT | ||
35 | QT += webkitwidgets | ||
36 | SOURCES += helpviewer_qwv.cpp | ||
37 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro | ||
38 | index 500a1534..b60fa2d9 100644 | ||
39 | --- a/src/designer/src/plugins/plugins.pro | ||
40 | +++ b/src/designer/src/plugins/plugins.pro | ||
41 | @@ -1,6 +1,6 @@ | ||
42 | TEMPLATE = subdirs | ||
43 | |||
44 | # qtHaveModule(opengl): SUBDIRS += tools/view3d | ||
45 | -qtHaveModule(webkitwidgets): SUBDIRS += qwebview | ||
46 | +qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview | ||
47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | ||
48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget | ||