feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Enable webkit for help plugin (Qt5 Build).

Browse Source 
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>
This commit is contained in:
Nikolai Kosjar
2012-10-05 13:43:40 +02:00
committed by Eike Ziller
parent 6c15f14bab
commit 366a9316ff
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/help.pro
View File

@@ -4,9 +4,11 @@ TARGET = Help
QT += network QT += network
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport help QT += printsupport help
DEFINES += QT_NO_WEBKIT !isEmpty(QT.webkit.name): QT += webkit
else: DEFINES += QT_NO_WEBKIT
} else { } else {
CONFIG += help CONFIG += help
contains(QT_CONFIG, webkit): QT += webkit
} }
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
@@ -68,7 +70,3 @@ FORMS += docsettingspage.ui \
RESOURCES += help.qrc RESOURCES += help.qrc
include(../../shared/help/help.pri) include(../../shared/help/help.pri)
contains(QT_CONFIG, webkit) {
QT += webkit
}