diff options
| author | Nikolai Kosjar <[email protected]> | 2012-10-05 13:43:40 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-10-08 09:55:57 +0200 |
| commit | 366a9316fff78d55f1a210ee23bc17718541fca3 (patch) | |
| tree | ae67742606636626e5b2d4a8eb2cdd4683a93410 /src/plugins/help/help.pro | |
| parent | 6c15f14bab0e27df99b333fc2321b1266c67dd1c (diff) | |
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 <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/help/help.pro')
| -rw-r--r-- | src/plugins/help/help.pro | 10 |
1 files 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 -} |