Suppress warnings in moc_*.cpp files.
This commit is contained in:
parent
505cd6d62f
commit
12f4a006fd
|
@ -804,36 +804,38 @@ Module {
|
|||
}
|
||||
|
||||
Properties {
|
||||
condition: Utilities.versionCompare(qbs.version, "1.22") < 0
|
||||
cpp.systemIncludePaths: {
|
||||
var qtLibs = [
|
||||
"QtCore",
|
||||
"QtSvg",
|
||||
"QtXml",
|
||||
"QtPrintSupport",
|
||||
"QtXmlPatterns",
|
||||
"QtWidgets",
|
||||
"QtGui",
|
||||
"QtNetwork",
|
||||
"QtTest",
|
||||
"QtConcurrent"
|
||||
];
|
||||
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
|
||||
|
||||
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"))
|
||||
{
|
||||
paths.push(Qt.core.incPath);
|
||||
if (!qbs.targetOS.contains("macos"))
|
||||
{
|
||||
paths.push(Qt.core.incPath);
|
||||
|
||||
for (var i = 0; i < qtLibs.length; i++) {
|
||||
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i]));
|
||||
}
|
||||
for (var i = 0; i < qtLibs.length; i++) {
|
||||
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i]));
|
||||
}
|
||||
|
||||
} else {
|
||||
for (var i = 0; i < qtLibs.length; i++) {
|
||||
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"));
|
||||
} else {
|
||||
for (var i = 0; i < qtLibs.length; i++) {
|
||||
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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user