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 | 13 |
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 @@ -From e6b77a5732610816948a8a860a9cb9e92b02c33e Mon Sep 17 00:00:00 2001 +From d59c24913f7edb0809ed32cf6dfeea874860d783 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] add noqtwebkit configuration +Subject: [PATCH 3/3] add noqtwebkit configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 5f96377..e461d4b 100644 +index 5f96377..e2dfa61 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ @@ -25,16 +25,17 @@ index 5f96377..e461d4b 100644 } else { DEFINES += QT_NO_WEBKIT diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index b7ee661..0c6e50a 100644 +index 500a153..12a6127 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ TEMPLATE = subdirs # qtHaveModule(opengl): SUBDIRS += tools/view3d -qtHaveModule(webkitwidgets): SUBDIRS += qwebview +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview win32: qtHaveModule(axcontainer): SUBDIRS += activeqt + qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -1.8.3.1 +2.0.0 |