feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Fix threading issue with QRegExp

Browse Source 
exactMatch() is declared const, but is actually not. Replace with
QRegularExpression.

Change-Id: Ib9d9c091de1cd81d81671c19a76cada8777ff287
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2015-08-14 16:56:18 +02:00
parent b5dcc86504
commit 2bc96c7621
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -44,7 +44,7 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QRegExp> #include <QRegularExpression>
#include <QSet> #include <QSet>
#include <QString> #include <QString>
@@ -154,8 +154,9 @@ private:
// We already provide a custom clang include path matching the used libclang version, // We already provide a custom clang include path matching the used libclang version,
// so better ignore the clang include paths from the system as this might lead to an // so better ignore the clang include paths from the system as this might lead to an
// unfavorable order with regard to include_next. // unfavorable order with regard to include_next.
static QRegExp clangIncludeDir(QLatin1String(".*/lib/clang/\\d+\\.\\d+(\\.\\d+)?/include")); static QRegularExpression clangIncludeDir(
if (clangIncludeDir.exactMatch(path)) QLatin1String("\\A.*/lib/clang/\\d+\\.\\d+(\\.\\d+)?/include\\z"));
if (clangIncludeDir.match(path).hasMatch())
return true; return true;
return false; return false;