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

52
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -804,36 +804,38 @@ Module {
} }
Properties { Properties {
condition: Utilities.versionCompare(qbs.version, "1.22") < 0
cpp.systemIncludePaths: { cpp.systemIncludePaths: {
var qtLibs = [ var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
"QtCore",
"QtSvg",
"QtXml",
"QtPrintSupport",
"QtXmlPatterns",
"QtWidgets",
"QtGui",
"QtNetwork",
"QtTest",
"QtConcurrent"
];
var paths = []; if (Utilities.versionCompare(qbs.version, "1.22") < 0) {
var qtLibs = [
"QtCore",
"QtSvg",
"QtXml",
"QtPrintSupport",
"QtXmlPatterns",
"QtWidgets",
"QtGui",
"QtNetwork",
"QtTest",
"QtConcurrent"
];
if (!qbs.targetOS.contains("macos")) if (!qbs.targetOS.contains("macos"))
{ {
paths.push(Qt.core.incPath); paths.push(Qt.core.incPath);
for (var i = 0; i < qtLibs.length; i++) { for (var i = 0; i < qtLibs.length; i++) {
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i])); paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i]));
} }
} else { } else {
for (var i = 0; i < qtLibs.length; i++) { 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,
"/Headers")); qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers")); "/Headers"));
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
}
} }
} }