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

TextEditor: Fix compile with Qt5.11

Browse Source 
Change-Id: Ic704c428c0574789d6c67f9a0ddff511a4ee8b26
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-02-20 07:39:17 +01:00
parent 5a47cd0d50
commit 16211cb589
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/texteditor/storagesettings.cpp
View File

@@ -25,6 +25,7 @@
#include "storagesettings.h" #include "storagesettings.h"
#include <utils/hostosinfo.h>
#include <utils/settingsutils.h> #include <utils/settingsutils.h>
#include <QRegularExpression> #include <QRegularExpression>
@@ -107,7 +108,13 @@ bool StorageSettings::removeTrailingWhitespace(const QString &fileName) const
QRegularExpressionMatch match = iter.next(); QRegularExpressionMatch match = iter.next();
QString pattern = match.captured(1); QString pattern = match.captured(1);
QString wildcardRegExp = QRegularExpression::wildcardToRegularExpression(pattern); QString wildcardRegExp
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
= QRegularExpression::wildcardToRegularExpression(pattern);
#else
= QRegExp(pattern, Utils::HostOsInfo::fileNameCaseSensitivity(),
QRegExp::Wildcard).pattern();
#endif
QRegularExpression patternRegExp(wildcardRegExp); QRegularExpression patternRegExp(wildcardRegExp);
QRegularExpressionMatch patternMatch = patternRegExp.match(fileName); QRegularExpressionMatch patternMatch = patternRegExp.match(fileName);
if (patternMatch.hasMatch()) { if (patternMatch.hasMatch()) {