diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index 214c6608f30..97eaefe9ece 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -5,15 +5,29 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "Help" - condition: qtcore.versionMajor === 4 - Depends { id: qtcore; name: "qt.core" } - Depends { name: "qt"; submodules: ['widgets', 'help', 'webkit', 'network'] } + Depends { id: qtcore; name: "Qt.core" } + Depends { + condition: qtcore.versionMajor == 4 + name: "Qt"; submodules: ["widgets", "help", "webkit", "network"] + } + Depends { + condition: qtcore.versionMajor >= 5 + name: "Qt"; submodules: ["widgets", "help", "network", "printsupport"] + } + Depends { name: "Core" } Depends { name: "Find" } Depends { name: "Locator" } Depends { name: "cpp" } - cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"]) + Properties { + condition: qtcore.versionMajor >= 5 + cpp.defines: base.concat(["QT_NO_WEBKIT"]) + } + cpp.defines: base.concat([ + "QT_CLUCENE_SUPPORT", + "HELP_LIBRARY" + ]) cpp.includePaths: [ "../../shared/help", ".",