From e5551987684f6304aec92466444b4f1119f6f6b3 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Thu, 31 Jan 2013 15:54:07 +0100
Subject: [PATCH] Do not use webkit in case of static build.
Since linking against a statically build qtwebkit fails, fallback to
use QTextBrowser. I guess we need to fix static webkit builds first.
Change-Id: I1bc6c1ae70f0e57fa179a3ffe8750bde97809d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
src/assistant/assistant/assistant.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index c5f9e5e93..1ad63f0a1 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
LANGUAGE = C++
TARGET = assistant
DESTDIR = $$QT.help.bins
-qtHaveModule(webkitwidgets) {
+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
QT += webkitwidgets
} else {
DEFINES += QT_NO_WEBKIT
@@ -79,7 +79,7 @@ SOURCES += aboutdialog.cpp \
openpageswidget.cpp \
openpagesmanager.cpp \
openpagesswitcher.cpp
-qtHaveModule(webkitwidgets) {
+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
SOURCES += helpviewer_qwv.cpp
} else {
SOURCES += helpviewer_qtb.cpp
--
GitLab