diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 768a7c83acf..6def6a15c51 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -8,9 +8,9 @@ QtcLibrary { var libs = []; if (qbs.targetOS.contains("windows")) { libs.push("user32", "iphlpapi", "ws2_32", "shell32", "ole32"); - if (qbs.toolchainType === "mingw") + if (qbs.toolchain.contains("mingw")) libs.push("uuid"); - else if (qbs.toolchainType === "msvc") + else if (qbs.toolchain.contains("msvc")) libs.push("dbghelp"); } else if (qbs.targetOS.contains("unix")) { if (!qbs.targetOS.contains("macos")) diff --git a/src/tools/processlauncher/processlauncher.qbs b/src/tools/processlauncher/processlauncher.qbs index 2f03f7fba57..750276396c2 100644 --- a/src/tools/processlauncher/processlauncher.qbs +++ b/src/tools/processlauncher/processlauncher.qbs @@ -11,9 +11,7 @@ QtcTool { Properties { condition: qbs.targetOS.contains("windows") - cpp.dynamicLibraries: { - return qbs.toolchainType === "msvc" ? ["user32", "dbghelp"] : ["user32"]; - } + cpp.dynamicLibraries: qbs.toolchain.contains("msvc") ? ["user32", "dbghelp"] : ["user32"] } files: [ diff --git a/src/tools/sdktool/sdktoollib.qbs b/src/tools/sdktool/sdktoollib.qbs index ca40590d8d1..17028776e40 100644 --- a/src/tools/sdktool/sdktoollib.qbs +++ b/src/tools/sdktool/sdktoollib.qbs @@ -27,7 +27,7 @@ QtcLibrary { var libs = []; if (qbs.targetOS.contains("windows")) libs.push("user32", "shell32"); - if (qbs.toolchainType === "msvc") + if (qbs.toolchain.contains("msvc")) libs.push("dbghelp"); return libs; }