diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 8578403fcc5..717ebe1d9fa 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -1,8 +1,11 @@ import qbs import qbs.Environment import qbs.FileInfo +import qbs.Utilities Module { + Depends { name: "cpp"; required: false } + property string qtcreator_display_version: '8.0.0-beta2' property string ide_version_major: '7' property string ide_version_minor: '83' @@ -92,4 +95,12 @@ Module { "QT_USE_QSTRINGBUILDER", ].concat(testsEnabled ? ["WITH_TESTS"] : []) .concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : []) + + Properties { + condition: cpp.present && qbs.toolchain.contains("msvc") && product.Qt + && Utilities.versionCompare(Qt.core.version, "6.3") >= 0 + && Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0 + && Utilities.versionCompare(qbs.version, "1.23") < 0 + cpp.cxxFlags: "/permissive-" + } } diff --git a/tests/manual/debugger/gui/gui.qbs b/tests/manual/debugger/gui/gui.qbs index 7a464f77c17..88e9bd53071 100644 --- a/tests/manual/debugger/gui/gui.qbs +++ b/tests/manual/debugger/gui/gui.qbs @@ -1,5 +1,6 @@ QtApplication { name: "Manual debugger gui test" + Depends { name: "qtc" } Depends { name: "Qt.widgets" } files: [ diff --git a/tests/manual/debugger/simple/simple_test_app.qbs b/tests/manual/debugger/simple/simple_test_app.qbs index 59cf3fe3074..ca2c56229e4 100644 --- a/tests/manual/debugger/simple/simple_test_app.qbs +++ b/tests/manual/debugger/simple/simple_test_app.qbs @@ -5,6 +5,7 @@ CppApplication { name: "Manual Test Simple Application" targetName: "simple_test_app" + Depends { name: "qtc" } Depends { name: "Qt.core" } Depends { name: "Qt.core-private"; required: false; condition: Qt.core.versionMajor > 4 } Depends { name: "Qt.core5compat"; condition: Qt.core.versionMajor > 5 } diff --git a/tests/manual/debugger/simple/simple_test_plugin.qbs b/tests/manual/debugger/simple/simple_test_plugin.qbs index 33f257c449b..eca6791c02c 100644 --- a/tests/manual/debugger/simple/simple_test_plugin.qbs +++ b/tests/manual/debugger/simple/simple_test_plugin.qbs @@ -4,6 +4,7 @@ DynamicLibrary { name: "Manual Test Simple Plugin" targetName: "simple_test_plugin" + Depends { name: "qtc" } Depends { name: "Qt.core" } files: [ "simple_test_plugin.cpp" ] diff --git a/tests/manual/widgets/crumblepath/crumblepath.qbs b/tests/manual/widgets/crumblepath/crumblepath.qbs index af1860a52ec..c9b32a0810f 100644 --- a/tests/manual/widgets/crumblepath/crumblepath.qbs +++ b/tests/manual/widgets/crumblepath/crumblepath.qbs @@ -3,6 +3,7 @@ import "../common/common.qbs" as Common CppApplication { name: "Manual Test Utils CrumblePath" + Depends { name: "qtc" } Depends { name: "Core" } Depends { name: "Utils" } diff --git a/tests/manual/widgets/infolabel/infolabel.qbs b/tests/manual/widgets/infolabel/infolabel.qbs index ce00065c7cf..dfba3bd9ef7 100644 --- a/tests/manual/widgets/infolabel/infolabel.qbs +++ b/tests/manual/widgets/infolabel/infolabel.qbs @@ -3,6 +3,7 @@ import "../common/common.qbs" as Common CppApplication { name: "Manual Test Utils InfoLabel" + Depends { name: "qtc" } Depends { name: "Core" } Depends { name: "Utils" } diff --git a/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs b/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs index 97a728a6f63..c04bd03e89f 100644 --- a/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs +++ b/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs @@ -3,6 +3,7 @@ import "../common/common.qbs" as Common CppApplication { name: "Manual Test Utils ManhattanStyle" + Depends { name: "qtc" } Depends { name: "Core" } Depends { name: "Utils" } diff --git a/tests/manual/widgets/tracing/tracing.qbs b/tests/manual/widgets/tracing/tracing.qbs index 06bbc4edd4a..95e661910ce 100644 --- a/tests/manual/widgets/tracing/tracing.qbs +++ b/tests/manual/widgets/tracing/tracing.qbs @@ -3,6 +3,7 @@ import "../common/common.qbs" as Common CppApplication { name: "Manual Test Tracing" + Depends { name: "qtc" } Depends { name: "Qt.quick" } Depends { name: "Tracing" } Depends { name: "Utils" }