diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-14 15:48:51 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-21 16:15:03 +0100 |
commit | 28656de664b398ff998fbbb106a399136b0e0b1f (patch) | |
tree | 45e66300f9a414eec9ddff0cc4828b8dff5882d7 /src/plugins/help | |
parent | d9c0362b7605b3dbd762c9d3034e9c1d6a2e6529 (diff) |
Help: Allow building without Webkit with qbs.
Change-Id: I03cbfcef594e072c4360be0f13f220ec83c1fc1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/help.qbs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index bcf629a5227..bedbc11a502 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -5,11 +5,20 @@ import QtcPlugin QtcPlugin { name: "Help" - Depends { name: "Qt"; submodules: ["help", "network", "webkit"]; } + Depends { name: "Qt"; submodules: ["help", "network"]; } Depends { condition: Qt.core.versionMajor >= 5; - name: "Qt"; submodules: ["printsupport", "webkitwidgets"]; + name: "Qt.printsupport" } + Depends { + name: "Qt.webkit" + required: false + } + Depends { + name: "Qt.webkitwidgets" + condition: Qt.core.versionMajor >= 5 && Qt.webkit.present + } + Depends { name: "Aggregation" } Depends { name: "Utils" } @@ -17,7 +26,12 @@ QtcPlugin { Depends { name: "app_version_header" } - cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"]) + cpp.defines: { + var defines = base.concat(["QT_CLUCENE_SUPPORT"]); + if (Qt.core.versionMajor >= 5 && !Qt.webkit.present) + defines.push("QT_NO_WEBKIT"); + return defines; + } // We include headers from src/shared/help, and their sources include headers from here... cpp.includePaths: base.concat([sharedSources.prefix, path]) |