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 | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch deleted file mode 100644 index 2e3349ba..00000000 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e3aba30a9cece54dd6a7edfcb39cbb1805b3dcac 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 3/3] 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> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/assistant/assistant/assistant.pro | 4 ++-- - src/designer/src/plugins/plugins.pro | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 6e82b07..56df78c 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(CONFIG, noqtwebkit) { - QT += webkitwidgets - } else { - DEFINES += QT_NO_WEBKIT -@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \ - openpageswidget.cpp \ - openpagesmanager.cpp \ - openpagesswitcher.cpp --qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { -+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { - SOURCES += helpviewer_qwv.cpp - } else { - SOURCES += helpviewer_qtb.cpp -diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a153..b60fa2d 100644 ---- a/src/designer/src/plugins/plugins.pro -+++ b/src/designer/src/plugins/plugins.pro -@@ -1,6 +1,6 @@ - TEMPLATE = subdirs - - # qtHaveModule(opengl): SUBDIRS += tools/view3d --qtHaveModule(webkitwidgets): SUBDIRS += qwebview -+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview - win32: qtHaveModule(axcontainer): SUBDIRS += activeqt - qtHaveModule(quickwidgets): SUBDIRS += qquickwidget --- -2.3.1 - |