meta-qt5/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch

   1 From 5012d9057afa20e34aa8a36c195f87b89d0fbf8c 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 3/3] 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 5f96377..71acdfc 100644
  20 --- a/src/assistant/assistant/assistant.pro
  21 +++ b/src/assistant/assistant/assistant.pro
  22 @@ -1,4 +1,4 @@
  23 -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
  24 +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
  25      QT += webkitwidgets
  26  } else {
  27      DEFINES += QT_NO_WEBKIT
  28 @@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \
  29      openpageswidget.cpp \
  30      openpagesmanager.cpp \
  31      openpagesswitcher.cpp
  32 -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
  33 +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
  34      SOURCES += helpviewer_qwv.cpp
  35  } else {
  36      SOURCES += helpviewer_qtb.cpp
  37 diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
  38 index 500a153..b60fa2d 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
  49 --
  50 2.1.1
  51