summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch')
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index 3238d795..956bff2f 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 @@
1From e6b77a5732610816948a8a860a9cb9e92b02c33e Mon Sep 17 00:00:00 2001 1From d59c24913f7edb0809ed32cf6dfeea874860d783 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] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15 2 files changed, 2 insertions(+), 2 deletions(-) 15 2 files changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 17diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
18index 5f96377..e461d4b 100644 18index 5f96377..e2dfa61 100644
19--- a/src/assistant/assistant/assistant.pro 19--- a/src/assistant/assistant/assistant.pro
20+++ b/src/assistant/assistant/assistant.pro 20+++ b/src/assistant/assistant/assistant.pro
21@@ -1,4 +1,4 @@ 21@@ -1,4 +1,4 @@
@@ -25,16 +25,17 @@ index 5f96377..e461d4b 100644
25 } else { 25 } else {
26 DEFINES += QT_NO_WEBKIT 26 DEFINES += QT_NO_WEBKIT
27diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 27diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
28index b7ee661..0c6e50a 100644 28index 500a153..12a6127 100644
29--- a/src/designer/src/plugins/plugins.pro 29--- a/src/designer/src/plugins/plugins.pro
30+++ b/src/designer/src/plugins/plugins.pro 30+++ b/src/designer/src/plugins/plugins.pro
31@@ -1,5 +1,5 @@ 31@@ -1,6 +1,6 @@
32 TEMPLATE = subdirs 32 TEMPLATE = subdirs
33 33
34 # qtHaveModule(opengl): SUBDIRS += tools/view3d 34 # qtHaveModule(opengl): SUBDIRS += tools/view3d
35-qtHaveModule(webkitwidgets): SUBDIRS += qwebview 35-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
36+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview 36+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview
37 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 37 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
38 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
38-- 39--
391.8.3.1 402.0.0
40 41