aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-10-19 11:20:23 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-10-19 09:52:43 +0000
commit3da308ae82229b6326cc8ac707c24a6e828b9090 (patch)
treed9868b40948897e26492ac64409ebc41d369eeac /sources/shiboken2/ApiExtractor
parentcae2ce11121189d426931e00a8d382171de8e925 (diff)
shiboken: Set multiline for the regular expressions for warning suppression
Some warnings are multiline (function modification). Change-Id: I34db1b15cd0122576e65122c0665d8b4987781fc Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor')
-rw-r--r--sources/shiboken2/ApiExtractor/typedatabase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.cpp b/sources/shiboken2/ApiExtractor/typedatabase.cpp
index dcfd9f740..4cb6cdd8a 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken2/ApiExtractor/typedatabase.cpp
@@ -474,12 +474,13 @@ bool TypeDatabase::addSuppressedWarning(const QString &warning, QString *errorMe
pattern.append(QLatin1Char('$'));
}
- const QRegularExpression expression(pattern);
+ QRegularExpression expression(pattern);
if (!expression.isValid()) {
*errorMessage = QLatin1String("Invalid message pattern \"") + warning
+ QLatin1String("\": ") + expression.errorString();
return false;
}
+ expression.setPatternOptions(expression.patternOptions() | QRegularExpression::MultilineOption);
m_suppressedWarnings.append(expression);
return true;