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

Suppress warnings in moc_*.cpp files.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-16 08:57:11 +02:00
parent 505cd6d62f
commit 12f4a006fd
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -804,8 +804,10 @@ Module {
}
Properties {
condition: Utilities.versionCompare(qbs.version, "1.22") < 0
cpp.systemIncludePaths: {
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
if (Utilities.versionCompare(qbs.version, "1.22") < 0) {
var qtLibs = [
"QtCore",
"QtSvg",
@ -819,8 +821,6 @@ Module {
"QtConcurrent"
];
var paths = [];
if (!qbs.targetOS.contains("macos"))
{
paths.push(Qt.core.incPath);
@ -831,11 +831,13 @@ Module {
} else {
for (var i = 0; i < qtLibs.length; i++) {
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
paths.push(FileInfo.joinPaths(Qt.core.incPath,
qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
"/Headers"));
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
}
}
}
return paths;
}