aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicting settings.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-03-08 18:48:30 +02:00
parent 37541b600e
commit 004f46847c
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qbs/imports/VApp.qbs
View File

@ -24,15 +24,25 @@ CppApplication {
cpp.compilerWrapper: "ccache" cpp.compilerWrapper: "ccache"
} }
Properties { cpp.cxxLanguageVersion: {
condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor < 12 if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
cpp.cxxLanguageVersion: "c++11" return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
} }
// Since Qt 5.12 available support for C++17
Properties { Properties {
condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12 condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.cxxLanguageVersion: "c++17" cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
} }
Group { Group {

21
qbs/imports/VLib.qbs
View File

@ -23,6 +23,27 @@ Library {
cpp.compilerWrapper: "ccache" cpp.compilerWrapper: "ccache"
} }
cpp.cxxLanguageVersion: {
if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
}
Properties {
condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
}
install: false install: false
installDebugInformation: false installDebugInformation: false

21
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -134,27 +134,6 @@ Module {
cpp.visibility: "minimal" cpp.visibility: "minimal"
cpp.cxxLanguageVersion: {
if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
}
Properties {
condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
}
readonly property string minimumMacosVersion: { readonly property string minimumMacosVersion: {
if (project.minimumMacosVersion !== undefined) if (project.minimumMacosVersion !== undefined)
return project.minimumMacosVersion; return project.minimumMacosVersion;