Commit a5cd588e authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Help plugin: Synchronize qmake and qbs project files.



We now use Qt Webkit in the qbs build as well.

Change-Id: Ib27a0d795bca3b266ee405ce2d925a96297f8c25
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 33892bca
......@@ -5,14 +5,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Help"
Depends { id: qtcore; name: "Qt.core" }
Depends { name: "Qt"; submodules: ["core", "help", "network", "webkit"]; }
Depends {
condition: qtcore.versionMajor == 4
name: "Qt"; submodules: ["widgets", "help", "webkit", "network"]
}
Depends {
condition: qtcore.versionMajor >= 5
name: "Qt"; submodules: ["widgets", "help", "network", "printsupport"]
condition: Qt.core.versionMajor >= 5;
name: "Qt"; submodules: ["printsupport", "webkitwidgets"];
}
Depends { name: "Core" }
......@@ -20,13 +16,7 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "app_version_header" }
cpp.defines: {
var list = base;
if (qtcore.versionMajor >= 5)
list.push("QT_NO_WEBKIT");
list.push("QT_CLUCENE_SUPPORT");
return list;
}
cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
// We include headers from src/shared/help, and their sources include headers from here...
cpp.includePaths: base.concat([sharedSources.prefix, path])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment