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

Don't detach temporary containers

Browse Source 
Change-Id: I736cfc61c81995a81b056b3e3e5703ded5912525
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Alessandro Portale
2021-02-15 00:49:15 +01:00
parent 925c4a3198
commit b2b6c64e6a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangtools/clangtoolsunittests.cpp
View File

@@ -128,7 +128,7 @@ void ClangToolsUnitTests::testProject()
QVERIFY(waitForFinishedTool.wait(m_timeout)); QVERIFY(waitForFinishedTool.wait(m_timeout));
// Check for errors // Check for errors
const QString errorText = waitForFinishedTool.takeFirst().first().toString(); const QString errorText = waitForFinishedTool.takeFirst().constFirst().toString();
const bool finishedSuccessfully = errorText.isEmpty(); const bool finishedSuccessfully = errorText.isEmpty();
if (!finishedSuccessfully) if (!finishedSuccessfully)
qWarning("Error: %s", qPrintable(errorText)); qWarning("Error: %s", qPrintable(errorText));

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -245,7 +245,7 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
if (!qmakeLocationTxt.open(QIODevice::ReadOnly)) { if (!qmakeLocationTxt.open(QIODevice::ReadOnly)) {
return FilePath(); return FilePath();
} }
FilePath qmakeLocation = FilePath::fromUtf8(qmakeLocationTxt.readLine().data()); FilePath qmakeLocation = FilePath::fromUtf8(qmakeLocationTxt.readLine().constData());
qCDebug(cmInputLog) << "qmake location: " << qmakeLocation.toUserOutput(); qCDebug(cmInputLog) << "qmake location: " << qmakeLocation.toUserOutput();
return qmakeLocation; return qmakeLocation;

4
src/plugins/projectexplorer/outputparser_test.cpp
View File

@@ -62,7 +62,7 @@ void OutputParserTester::testParsing(const QString &lines,
{ {
const auto terminator = new TestTerminator(this); const auto terminator = new TestTerminator(this);
if (!lineParsers().isEmpty()) if (!lineParsers().isEmpty())
terminator->setRedirectionDetector(lineParsers().last()); terminator->setRedirectionDetector(lineParsers().constLast());
addLineParser(terminator); addLineParser(terminator);
reset(); reset();
@@ -113,7 +113,7 @@ TestTerminator::TestTerminator(OutputParserTester *t) :
m_tester(t) m_tester(t)
{ {
if (!t->lineParsers().isEmpty()) { if (!t->lineParsers().isEmpty()) {
for (const Utils::FilePath &searchDir : t->lineParsers().first()->searchDirectories()) for (const Utils::FilePath &searchDir : t->lineParsers().constFirst()->searchDirectories())
addSearchDir(searchDir); addSearchDir(searchDir);
} }
} }