1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From a0637f231d513dfc15f1eec185d5d5e7fb03e292 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/4] 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 ef5c595..9c2dc1c 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) {
BROWSER = qtwebkit
} else {
BROWSER = qtextbrowser
@@ -75,7 +75,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 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.7.0
|
