Patchwork [meta-qt5] qttools: make qtwebkit a PACKAGECONFIG and disable by default

login
register
mail settings
Submitter Andreas Müller
Date June 14, 2014, 12:01 a.m.
Message ID <1402704117-29321-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/73799/
State New, archived
Headers show

Comments

Andreas Müller - June 14, 2014, 12:01 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-qt/qt5/qttools.inc                         |  8 ++++-
 .../0003-add-noqtwebkit-configuration.patch        | 40 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch

Patch

diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc
index d4d8017..cd8a97f 100644
--- a/recipes-qt/qt5/qttools.inc
+++ b/recipes-qt/qt5/qttools.inc
@@ -1,9 +1,10 @@ 
 require qt5.inc
 
-DEPENDS += "qtbase qtdeclarative qtwebkit qtxmlpatterns"
+DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 SRC_URI += " \
     file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
+    file://0003-add-noqtwebkit-configuration.patch \
 "
 
 # older copyright year than what e.g. qtbase is using now
@@ -13,3 +14,8 @@  LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
 
 FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
+
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
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 0000000..3238d79
--- /dev/null
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -0,0 +1,40 @@ 
+From e6b77a5732610816948a8a860a9cb9e92b02c33e 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropiate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/assistant/assistant/assistant.pro | 2 +-
+ src/designer/src/plugins/plugins.pro  | 2 +-
+ 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
+--- a/src/assistant/assistant/assistant.pro
++++ b/src/assistant/assistant/assistant.pro
+@@ -1,4 +1,4 @@
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(QT_CONFIG, noqtwebkit) {
+     QT += webkitwidgets
+ } 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
+--- a/src/designer/src/plugins/plugins.pro
++++ b/src/designer/src/plugins/plugins.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = subdirs
+ 
+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview
+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+-- 
+1.8.3.1
+