From bb772ad97c4a8c68d3eaa0472873567348101fbd Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 24 Jun 2020 09:49:26 +0200 Subject: [PATCH] ClearCase: Compile fix for Qt 5.15 Amends 9efa934ae099585. Change-Id: I4ef9caf61f708f94ad2bda6ea826be4567238282 Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/clearcasesync.cpp | 9 +++++++-- 1 file 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)