diff --git a/src/plugins/projectexplorer/xcodebuildparser.cpp b/src/plugins/projectexplorer/xcodebuildparser.cpp index 41f24e0a384..f592c5321ae 100644 --- a/src/plugins/projectexplorer/xcodebuildparser.cpp +++ b/src/plugins/projectexplorer/xcodebuildparser.cpp @@ -37,7 +37,7 @@ namespace ProjectExplorer { static const char failureRe[] = "\\*\\* BUILD FAILED \\*\\*$"; static const char successRe[] = "\\*\\* BUILD SUCCEEDED \\*\\*$"; static const char buildRe[] = "=== BUILD (AGGREGATE )?TARGET (.*) OF PROJECT (.*) WITH .* ===$"; -static const char signatureChangeRe[] = "(.+): replacing existing signature$"; +static const char signatureChangeEndsWithPattern[] = ": replacing existing signature"; XcodebuildParser::XcodebuildParser() : m_fatalErrorCount(0), @@ -50,8 +50,6 @@ XcodebuildParser::XcodebuildParser() : QTC_CHECK(m_successRe.isValid()); m_buildRe.setPattern(QLatin1String(buildRe)); QTC_CHECK(m_buildRe.isValid()); - m_replacingSignatureRe.setPattern(QLatin1String(signatureChangeRe)); - QTC_CHECK(m_replacingSignatureRe.isValid()); } bool XcodebuildParser::hasFatalErrors() const @@ -73,11 +71,12 @@ void XcodebuildParser::stdOutput(const QString &line) m_xcodeBuildParserState = OutsideXcodebuild; return; } - if (m_replacingSignatureRe.indexIn(lne) > -1) { + if (lne.endsWith(QLatin1String(signatureChangeEndsWithPattern))) { Task task(Task::Warning, QCoreApplication::translate("ProjectExplorer::XcodebuildParser", "Replacing signature"), - Utils::FileName::fromString(m_replacingSignatureRe.cap(1)), /* filename */ + Utils::FileName::fromString( + lne.left(lne.size() - QLatin1String(signatureChangeEndsWithPattern).size())), /* filename */ -1, /* line */ Constants::TASK_CATEGORY_COMPILE); taskAdded(task, 1); diff --git a/src/plugins/projectexplorer/xcodebuildparser.h b/src/plugins/projectexplorer/xcodebuildparser.h index 2557c703421..32f40da2260 100644 --- a/src/plugins/projectexplorer/xcodebuildparser.h +++ b/src/plugins/projectexplorer/xcodebuildparser.h @@ -55,7 +55,6 @@ private: QRegExp m_failureRe; QRegExp m_successRe; QRegExp m_buildRe; - QRegExp m_replacingSignatureRe; XcodebuildStatus m_xcodeBuildParserState; QString m_lastTarget; QString m_lastProject;