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.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index bbd338aa..0c3842eb 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From 594d23ecc0f62e6a0ebfcb7b9cb879435211420a Mon Sep 17 00:00:00 2001 1From a4438a8c93e9846f1057dd7a21cbb41183440ec1 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 3/3] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -16,24 +16,24 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 3 insertions(+), 3 deletions(-) 16 2 files changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index 6e82b07..56df78c 100644 19index ef5c595..9c2dc1c 100644
20--- a/src/assistant/assistant/assistant.pro 20--- a/src/assistant/assistant/assistant.pro
21+++ b/src/assistant/assistant/assistant.pro 21+++ b/src/assistant/assistant/assistant.pro
22@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
23-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { 23-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
24+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { 24+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
25 QT += webkitwidgets 25 BROWSER = qtwebkit
26 } else { 26 } else {
27 DEFINES += QT_NO_WEBKIT 27 BROWSER = qtextbrowser
28@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \ 28@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
29 openpageswidget.cpp \
30 openpagesmanager.cpp \ 29 openpagesmanager.cpp \
31 openpagesswitcher.cpp 30 openpagesswitcher.cpp
32-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { 31
33+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { 32-equals(BROWSER, "qtwebkit") {
33+equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) {
34 DEFINES += BROWSER_QTWEBKIT
35 QT += webkitwidgets
34 SOURCES += helpviewer_qwv.cpp 36 SOURCES += helpviewer_qwv.cpp
35 } else {
36 SOURCES += helpviewer_qtb.cpp
37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
38index 500a153..b60fa2d 100644 38index 500a153..b60fa2d 100644
39--- a/src/designer/src/plugins/plugins.pro 39--- a/src/designer/src/plugins/plugins.pro