diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 2de9560084926b5575b79da4ab32b7c533f631a2..2d2a937c70d5d0be4bd8ed7797f6c49c92bf552c 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -18,7 +18,7 @@ QtcLibrary { } Depends { name: "cpp" } - Depends { name: "Qt"; submodules: ['widgets', 'network', 'script'] } + Depends { name: "Qt"; submodules: ['widgets', 'network', 'script', 'concurrent'] } Depends { name: "Botan" } Depends { name: "app_version_header" } @@ -253,5 +253,9 @@ QtcLibrary { "unixutils.cpp" ] } + + ProductModule { + Depends { name: "Qt"; submodules: ["concurrent"] } + } } diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 918a0e6f15291a625218f8a5fd2b4d2a3b6536e7..2a1c12397660553ef37ba4c28ffc1d4f7bbe11b6 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -4,7 +4,13 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "Core" - Depends { name: "qt"; submodules: ['core', 'widgets', 'xml', 'network', 'script', 'sql', 'help'] } + Depends { + name: "qt" + submodules: [ + 'core', 'widgets', 'xml', 'network', + 'script', 'sql', 'help', 'printsupport' + ] + } Depends { name: "Utils" } Depends { name: "ExtensionSystem" } Depends { name: "Aggregation" } diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index 88e6243410463bb0573a789046c3b2bf9e79fc6e..6d1df282479c1412aba553867c23fbe2a57527aa 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -5,6 +5,8 @@ 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'] } Depends { name: "Core" } Depends { name: "Find" } diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs index c6dfb243baa3060eaa375d5ce6e67c24fb902c24..e77f8dbca527d3660f37e72345a462e3279a5db2 100644 --- a/src/plugins/qmldesigner/qmldesigner.qbs +++ b/src/plugins/qmldesigner/qmldesigner.qbs @@ -5,6 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "QmlDesigner" + condition: qtcore.versionMajor === 4 + Depends { id: qtcore; name: "qt.core" } Depends { name: "qt"; submodules: ['widgets', 'quick1'] } Depends { name: "Core" } Depends { name: "QmlJS" }