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

Help plugin: Synchronize qmake and qbs project files.

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

Change-Id: Ib27a0d795bca3b266ee405ce2d925a96297f8c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-09-24 16:28:00 +02:00
parent 33892bca7f
commit a5cd588e3b
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/help/help.qbs
View File

@@ -5,14 +5,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "Help" name: "Help"
Depends { id: qtcore; name: "Qt.core" } Depends { name: "Qt"; submodules: ["core", "help", "network", "webkit"]; }
Depends { Depends {
condition: qtcore.versionMajor == 4 condition: Qt.core.versionMajor >= 5;
name: "Qt"; submodules: ["widgets", "help", "webkit", "network"] name: "Qt"; submodules: ["printsupport", "webkitwidgets"];
}
Depends {
condition: qtcore.versionMajor >= 5
name: "Qt"; submodules: ["widgets", "help", "network", "printsupport"]
} }
Depends { name: "Core" } Depends { name: "Core" }
@@ -20,13 +16,7 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
cpp.defines: { cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
var list = base;
if (qtcore.versionMajor >= 5)
list.push("QT_NO_WEBKIT");
list.push("QT_CLUCENE_SUPPORT");
return list;
}
// We include headers from src/shared/help, and their sources include headers from here... // We include headers from src/shared/help, and their sources include headers from here...
cpp.includePaths: base.concat([sharedSources.prefix, path]) cpp.includePaths: base.concat([sharedSources.prefix, path])