From 366a9316fff78d55f1a210ee23bc17718541fca3 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Fri, 5 Oct 2012 13:43:40 +0200
Subject: [PATCH] Enable webkit for help plugin (Qt5 Build).

Now the formatting in the help viewer looks as usual again.

Webkit was disabled to make creator compile with Qt5 in the Nov 2011
days.

Change-Id: Ic926cc94bda4a4953360f2daee414ba17aa4037b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/help/help.pro | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 042887049b4..954b92d548f 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -4,9 +4,11 @@ TARGET = Help
 QT += network
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += printsupport help
-    DEFINES += QT_NO_WEBKIT
+    !isEmpty(QT.webkit.name): QT += webkit
+    else: DEFINES += QT_NO_WEBKIT
 } else {
-   CONFIG += help
+    CONFIG += help
+    contains(QT_CONFIG, webkit): QT += webkit
 }
 
 INCLUDEPATH += $$PWD
@@ -68,7 +70,3 @@ FORMS += docsettingspage.ui \
 
 RESOURCES += help.qrc
 include(../../shared/help/help.pri)
-
-contains(QT_CONFIG, webkit) {
-    QT += webkit
-}