forked from qt-creator/qt-creator
qbs build: Fix building with MSVC and Qt >= 6.3
Change-Id: I59439217575bdcc170f38382129fa5f13edb23e2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -1,8 +1,11 @@
|
|||||||
import qbs
|
import qbs
|
||||||
import qbs.Environment
|
import qbs.Environment
|
||||||
import qbs.FileInfo
|
import qbs.FileInfo
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
Module {
|
Module {
|
||||||
|
Depends { name: "cpp"; required: false }
|
||||||
|
|
||||||
property string qtcreator_display_version: '8.0.0-beta2'
|
property string qtcreator_display_version: '8.0.0-beta2'
|
||||||
property string ide_version_major: '7'
|
property string ide_version_major: '7'
|
||||||
property string ide_version_minor: '83'
|
property string ide_version_minor: '83'
|
||||||
@@ -92,4 +95,12 @@ Module {
|
|||||||
"QT_USE_QSTRINGBUILDER",
|
"QT_USE_QSTRINGBUILDER",
|
||||||
].concat(testsEnabled ? ["WITH_TESTS"] : [])
|
].concat(testsEnabled ? ["WITH_TESTS"] : [])
|
||||||
.concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : [])
|
.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-"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
QtApplication {
|
QtApplication {
|
||||||
name: "Manual debugger gui test"
|
name: "Manual debugger gui test"
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Qt.widgets" }
|
Depends { name: "Qt.widgets" }
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
|
@@ -5,6 +5,7 @@ CppApplication {
|
|||||||
name: "Manual Test Simple Application"
|
name: "Manual Test Simple Application"
|
||||||
targetName: "simple_test_app"
|
targetName: "simple_test_app"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Qt.core" }
|
Depends { name: "Qt.core" }
|
||||||
Depends { name: "Qt.core-private"; required: false; condition: Qt.core.versionMajor > 4 }
|
Depends { name: "Qt.core-private"; required: false; condition: Qt.core.versionMajor > 4 }
|
||||||
Depends { name: "Qt.core5compat"; condition: Qt.core.versionMajor > 5 }
|
Depends { name: "Qt.core5compat"; condition: Qt.core.versionMajor > 5 }
|
||||||
|
@@ -4,6 +4,7 @@ DynamicLibrary {
|
|||||||
name: "Manual Test Simple Plugin"
|
name: "Manual Test Simple Plugin"
|
||||||
targetName: "simple_test_plugin"
|
targetName: "simple_test_plugin"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Qt.core" }
|
Depends { name: "Qt.core" }
|
||||||
|
|
||||||
files: [ "simple_test_plugin.cpp" ]
|
files: [ "simple_test_plugin.cpp" ]
|
||||||
|
@@ -3,6 +3,7 @@ import "../common/common.qbs" as Common
|
|||||||
CppApplication {
|
CppApplication {
|
||||||
name: "Manual Test Utils CrumblePath"
|
name: "Manual Test Utils CrumblePath"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ import "../common/common.qbs" as Common
|
|||||||
CppApplication {
|
CppApplication {
|
||||||
name: "Manual Test Utils InfoLabel"
|
name: "Manual Test Utils InfoLabel"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ import "../common/common.qbs" as Common
|
|||||||
CppApplication {
|
CppApplication {
|
||||||
name: "Manual Test Utils ManhattanStyle"
|
name: "Manual Test Utils ManhattanStyle"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ import "../common/common.qbs" as Common
|
|||||||
CppApplication {
|
CppApplication {
|
||||||
name: "Manual Test Tracing"
|
name: "Manual Test Tracing"
|
||||||
|
|
||||||
|
Depends { name: "qtc" }
|
||||||
Depends { name: "Qt.quick" }
|
Depends { name: "Qt.quick" }
|
||||||
Depends { name: "Tracing" }
|
Depends { name: "Tracing" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
Reference in New Issue
Block a user