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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibd07b5b5ff7c3282134b062ed28b1c4951061c97
This commit is contained in:
Eike Ziller
2021-06-11 14:20:21 +02:00
parent dcfc467959 b1926e41c5
commit 2f7f645983
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -922,7 +922,7 @@ void CMakeBuildSystem::runCTest()
process.setWorkingDirectory(workingDirectory);
process.start(cmd.executable().toString(), cmd.splitArguments(), QIODevice::ReadOnly);
if (!process.waitForStarted(1000) || !process.waitForFinished(1000)) {
if (!process.waitForStarted(1000) || !process.waitForFinished()) {
if (process.state() == QProcess::NotRunning)
return;
process.terminate();
@@ -1139,7 +1139,7 @@ QList<ExtraCompiler *> CMakeBuildSystem::findExtraCompilers()
// Find all files generated by any of the extra compilers, in a rather crude way.
Project *p = project();
const FilePaths fileList = p->files([&fileExtensions](const Node *n) {
if (!Project::SourceFiles(n))
if (!Project::SourceFiles(n) || !n->isEnabled()) // isEnabled excludes nodes from the file system tree
return false;
const QString fp = n->filePath().toString();
const int pos = fp.lastIndexOf('.');

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

@@ -64,8 +64,6 @@ FileApiReader::FileApiReader()
FileApiReader::~FileApiReader()
{
if (isParsing())
emit errorOccurred(tr("Parsing has been canceled."));
stop();
resetData();
}