From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= 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 Signed-off-by: Martin Jansa --- 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 540c9689..2312b521 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ -false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { +false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { # FIXME: currently broken BROWSER = qtwebkit } else { @@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ openpagesmanager.cpp \ openpagesswitcher.cpp -equals(BROWSER, "qtwebkit") { +equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { DEFINES += BROWSER_QTWEBKIT QT += webkitwidgets SOURCES += helpviewer_qwv.cpp diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro index 500a1534..b60fa2d9 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