1From dfd1f8f5d4ac5ae62597aad0d6ec9b680f1a6545 Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 3Date: Wed, 4 Jun 2014 11:28:16 +0200 4Subject: [PATCH] add noqtwebkit configuration 5MIME-Version: 1.0 6Content-Type: text/plain; charset=UTF-8 7Content-Transfer-Encoding: 8bit 8 9Upstream-Status: Inappropriate [configuration] 10 11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 12Signed-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 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 19index 5da0b007..9571697f 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 BROWSER = qtwebkit 26 } else { 27 BROWSER = qtextbrowser 28@@ -77,7 +77,7 @@ SOURCES += aboutdialog.cpp \ 29 openpagesmanager.cpp \ 30 openpagesswitcher.cpp 31 32-equals(BROWSER, "qtwebkit") { 33+equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { 34 DEFINES += BROWSER_QTWEBKIT 35 QT += webkitwidgets 36 SOURCES += helpviewer_qwv.cpp 37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 38index 500a1534..b60fa2d9 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