diff options
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch')
| -rw-r--r-- | recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch new file mode 100644 index 00000000..3238d795 --- /dev/null +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From e6b77a5732610816948a8a860a9cb9e92b02c33e 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 | --- | ||
| 13 | src/assistant/assistant/assistant.pro | 2 +- | ||
| 14 | src/designer/src/plugins/plugins.pro | 2 +- | ||
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro | ||
| 18 | index 5f96377..e461d4b 100644 | ||
| 19 | --- a/src/assistant/assistant/assistant.pro | ||
| 20 | +++ b/src/assistant/assistant/assistant.pro | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | ||
| 23 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(QT_CONFIG, noqtwebkit) { | ||
| 24 | QT += webkitwidgets | ||
| 25 | } else { | ||
| 26 | DEFINES += QT_NO_WEBKIT | ||
| 27 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro | ||
| 28 | index b7ee661..0c6e50a 100644 | ||
| 29 | --- a/src/designer/src/plugins/plugins.pro | ||
| 30 | +++ b/src/designer/src/plugins/plugins.pro | ||
| 31 | @@ -1,5 +1,5 @@ | ||
| 32 | TEMPLATE = subdirs | ||
| 33 | |||
| 34 | # qtHaveModule(opengl): SUBDIRS += tools/view3d | ||
| 35 | -qtHaveModule(webkitwidgets): SUBDIRS += qwebview | ||
| 36 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview | ||
| 37 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | ||
| 38 | -- | ||
| 39 | 1.8.3.1 | ||
| 40 | |||
