1*4882a593SmuzhiyunFrom dfd1f8f5d4ac5ae62597aad0d6ec9b680f1a6545 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 3*4882a593SmuzhiyunDate: Wed, 4 Jun 2014 11:28:16 +0200 4*4882a593SmuzhiyunSubject: [PATCH] add noqtwebkit configuration 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Inappropriate [configuration] 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Andreas Müller <schnitzeltony@googlemail.com> 12*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun src/assistant/assistant/assistant.pro | 4 ++-- 15*4882a593Smuzhiyun src/designer/src/plugins/plugins.pro | 2 +- 16*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 3 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 19*4882a593Smuzhiyunindex 5da0b007..9571697f 100644 20*4882a593Smuzhiyun--- a/src/assistant/assistant/assistant.pro 21*4882a593Smuzhiyun+++ b/src/assistant/assistant/assistant.pro 22*4882a593Smuzhiyun@@ -1,4 +1,4 @@ 23*4882a593Smuzhiyun-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { 24*4882a593Smuzhiyun+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { 25*4882a593Smuzhiyun BROWSER = qtwebkit 26*4882a593Smuzhiyun } else { 27*4882a593Smuzhiyun BROWSER = qtextbrowser 28*4882a593Smuzhiyun@@ -77,7 +77,7 @@ SOURCES += aboutdialog.cpp \ 29*4882a593Smuzhiyun openpagesmanager.cpp \ 30*4882a593Smuzhiyun openpagesswitcher.cpp 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun-equals(BROWSER, "qtwebkit") { 33*4882a593Smuzhiyun+equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { 34*4882a593Smuzhiyun DEFINES += BROWSER_QTWEBKIT 35*4882a593Smuzhiyun QT += webkitwidgets 36*4882a593Smuzhiyun SOURCES += helpviewer_qwv.cpp 37*4882a593Smuzhiyundiff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 38*4882a593Smuzhiyunindex 500a1534..b60fa2d9 100644 39*4882a593Smuzhiyun--- a/src/designer/src/plugins/plugins.pro 40*4882a593Smuzhiyun+++ b/src/designer/src/plugins/plugins.pro 41*4882a593Smuzhiyun@@ -1,6 +1,6 @@ 42*4882a593Smuzhiyun TEMPLATE = subdirs 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun # qtHaveModule(opengl): SUBDIRS += tools/view3d 45*4882a593Smuzhiyun-qtHaveModule(webkitwidgets): SUBDIRS += qwebview 46*4882a593Smuzhiyun+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview 47*4882a593Smuzhiyun win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 48*4882a593Smuzhiyun qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 49