From 2c050f77500aa742b30629d243b10bc1641d9f9f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 23 Nov 2016 10:20:58 +0100 Subject: [PATCH] Don't use static variables in differ Now the differ may run in parallel in many threads. Static variables may lead to crash. Change-Id: Iae0d7678cdca3e57cb619141081250b458852bfb Reviewed-by: Eike Ziller --- src/plugins/diffeditor/differ.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp index 2ebdff108b4..a79fe9ffbfb 100644 --- a/src/plugins/diffeditor/differ.cpp +++ b/src/plugins/diffeditor/differ.cpp @@ -202,9 +202,9 @@ static QList cleanupOverlaps(const QList &diffList) static int cleanupSemanticsScore(const QString &text1, const QString &text2) { - static QRegExp blankLineEnd = QRegExp(QLatin1String("\\n\\r?\\n$")); - static QRegExp blankLineStart = QRegExp(QLatin1String("^\\r?\\n\\r?\\n")); - static QRegExp sentenceEnd = QRegExp(QLatin1String("\\. $")); + const QRegExp blankLineEnd = QRegExp(QLatin1String("\\n\\r?\\n$")); + const QRegExp blankLineStart = QRegExp(QLatin1String("^\\r?\\n\\r?\\n")); + const QRegExp sentenceEnd = QRegExp(QLatin1String("\\. $")); if (!text1.count() || !text2.count()) // Edges return 6;