aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clearcase/clearcasesync.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-24 09:49:26 +0200
committerhjk <hjk@qt.io>2020-06-24 08:17:24 +0000
commitbb772ad97c4a8c68d3eaa0472873567348101fbd (patch)
treebbc58187d8d0889d965c2946aa9b248343014dde /src/plugins/clearcase/clearcasesync.cpp
parenta98c254c594e3e25e05b5d4392fe7bc79b05cea8 (diff)
ClearCase: Compile fix for Qt 5.15
Amends 9efa934ae099585. Change-Id: I4ef9caf61f708f94ad2bda6ea826be4567238282 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/clearcase/clearcasesync.cpp')
-rw-r--r--src/plugins/clearcase/clearcasesync.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index 939badec15d..9a999153369 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -92,10 +92,15 @@ void ClearCaseSync::processCleartoolLsLine(const QDir &viewRootDir, const QStrin
QTC_CHECK(QFileInfo::exists(absFile));
QTC_CHECK(!absFile.isEmpty());
- const QRegularExpression reState("^\\s*\\[[^\\]]*\\]"); // [hijacked]; [loaded but missing]
+ const QRegularExpression reState("\\s*\\[[^\\]]*\\]"); // [hijacked]; [loaded but missing]
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ const QRegularExpression::MatchOption mo = QRegularExpression::AnchoredMatchOption;
+#else
+ const QRegularExpression::MatchOption mo = QRegularExpression::AnchorAtOffsetMatchOption;
+#endif
const QRegularExpressionMatch match = reState.match(buffer, wspos + 1,
QRegularExpression::NormalMatch,
- QRegularExpression::AnchorAtOffsetMatchOption);
+ mo);
if (match.hasMatch()) {
const QString ccState = match.captured();
if (ccState.indexOf(QLatin1String("hijacked")) != -1)