forked from qt-creator/qt-creator
The code was pushing an additional QFutureInterface through the whole chain of functions, which was used for canceling. But since it was never started (and never finished, and never used for reporting results), calling waitForFinshed on it never had any effect with Qt5 and locks up with Qt6. Instead of using a separate QFutureInterface, use the actual QFuture that is available and intended for it. Fixes: QTCREATORBUG-24902 Change-Id: I5a49bcecc9cf70fbffa93aee4293004f9369df58 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
245 lines
9.3 KiB
C++
245 lines
9.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2017 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "cppprojectinfogenerator.h"
|
|
|
|
#include "cppprojectfilecategorizer.h"
|
|
|
|
#include <projectexplorer/headerpath.h>
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
#include <projectexplorer/taskhub.h>
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
#include <QTimer>
|
|
|
|
#include <set>
|
|
|
|
using namespace ProjectExplorer;
|
|
|
|
namespace CppTools {
|
|
namespace Internal {
|
|
|
|
ProjectInfoGenerator::ProjectInfoGenerator(const QFutureInterface<ProjectInfo> &futureInterface,
|
|
const ProjectUpdateInfo &projectUpdateInfo)
|
|
: m_futureInterface(futureInterface)
|
|
, m_projectUpdateInfo(projectUpdateInfo)
|
|
{
|
|
}
|
|
|
|
ProjectInfo ProjectInfoGenerator::generate()
|
|
{
|
|
ProjectInfo projectInfo(m_projectUpdateInfo.project);
|
|
|
|
for (const RawProjectPart &rpp : m_projectUpdateInfo.rawProjectParts) {
|
|
if (m_futureInterface.isCanceled())
|
|
return ProjectInfo();
|
|
|
|
for (const ProjectPart::Ptr &part : createProjectParts(rpp))
|
|
projectInfo.appendProjectPart(part);
|
|
}
|
|
|
|
static const auto showWarning = [](const QString &message) {
|
|
QTimer::singleShot(0, TaskHub::instance(), [message] {
|
|
TaskHub::addTask(BuildSystemTask(Task::Warning, message));
|
|
});
|
|
};
|
|
if (m_cToolchainMissing) {
|
|
showWarning(QCoreApplication::translate("CppTools",
|
|
"The project contains C source files, but the currently active kit "
|
|
"has no C compiler. The code model will not be fully functional."));
|
|
}
|
|
if (m_cxxToolchainMissing) {
|
|
showWarning(QCoreApplication::translate("CppTools",
|
|
"The project contains C++ source files, but the currently active kit "
|
|
"has no C++ compiler. The code model will not be fully functional."));
|
|
}
|
|
return projectInfo;
|
|
}
|
|
|
|
static ProjectPart::Ptr projectPartFromRawProjectPart(
|
|
const RawProjectPart &rawProjectPart, Project *project)
|
|
{
|
|
ProjectPart::Ptr part(new ProjectPart);
|
|
part->project = project;
|
|
part->projectFile = rawProjectPart.projectFile;
|
|
part->projectConfigFile = rawProjectPart.projectConfigFile;
|
|
part->projectFileLine = rawProjectPart.projectFileLine;
|
|
part->projectFileColumn = rawProjectPart.projectFileColumn;
|
|
part->callGroupId = rawProjectPart.callGroupId;
|
|
part->buildSystemTarget = rawProjectPart.buildSystemTarget;
|
|
part->buildTargetType = rawProjectPart.buildTargetType;
|
|
part->qtVersion = rawProjectPart.qtVersion;
|
|
part->projectMacros = rawProjectPart.projectMacros;
|
|
if (!part->projectConfigFile.isEmpty())
|
|
part->projectMacros += Macro::toMacros(ProjectPart::readProjectConfigFile(part));
|
|
|
|
// Prevent duplicate include paths.
|
|
std::set<QString> seenPaths;
|
|
for (const HeaderPath &p : qAsConst(rawProjectPart.headerPaths)) {
|
|
const QString cleanPath = QDir::cleanPath(p.path);
|
|
if (seenPaths.insert(cleanPath).second)
|
|
part->headerPaths << HeaderPath(cleanPath, p.type);
|
|
}
|
|
|
|
part->precompiledHeaders = rawProjectPart.precompiledHeaders;
|
|
part->selectedForBuilding = rawProjectPart.selectedForBuilding;
|
|
|
|
return part;
|
|
}
|
|
|
|
const QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(
|
|
const RawProjectPart &rawProjectPart)
|
|
{
|
|
using Utils::LanguageExtension;
|
|
|
|
QVector<ProjectPart::Ptr> result;
|
|
ProjectFileCategorizer cat(rawProjectPart.displayName,
|
|
rawProjectPart.files,
|
|
rawProjectPart.fileIsActive);
|
|
|
|
if (!cat.hasParts())
|
|
return result;
|
|
|
|
const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart,
|
|
m_projectUpdateInfo.project);
|
|
|
|
if (m_projectUpdateInfo.cxxToolChain) {
|
|
if (cat.hasCxxSources()) {
|
|
result << createProjectPart(rawProjectPart,
|
|
part,
|
|
cat.cxxSources(),
|
|
cat.partName("C++"),
|
|
Language::Cxx,
|
|
LanguageExtension::None);
|
|
}
|
|
if (cat.hasObjcxxSources()) {
|
|
result << createProjectPart(rawProjectPart,
|
|
part,
|
|
cat.objcxxSources(),
|
|
cat.partName("Obj-C++"),
|
|
Language::Cxx,
|
|
LanguageExtension::ObjectiveC);
|
|
}
|
|
} else if (cat.hasCxxSources() || cat.hasObjcxxSources()) {
|
|
m_cxxToolchainMissing = true;
|
|
}
|
|
|
|
if (m_projectUpdateInfo.cToolChain) {
|
|
if (cat.hasCSources()) {
|
|
result << createProjectPart(rawProjectPart,
|
|
part,
|
|
cat.cSources(),
|
|
cat.partName("C"),
|
|
Language::C,
|
|
LanguageExtension::None);
|
|
}
|
|
|
|
if (cat.hasObjcSources()) {
|
|
result << createProjectPart(rawProjectPart,
|
|
part,
|
|
cat.objcSources(),
|
|
cat.partName("Obj-C"),
|
|
Language::C,
|
|
LanguageExtension::ObjectiveC);
|
|
}
|
|
} else if (cat.hasCSources() || cat.hasObjcSources()) {
|
|
m_cToolchainMissing = true;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
ProjectPart::Ptr ProjectInfoGenerator::createProjectPart(
|
|
const RawProjectPart &rawProjectPart,
|
|
const ProjectPart::Ptr &templateProjectPart,
|
|
const ProjectFiles &projectFiles,
|
|
const QString &partName,
|
|
Language language,
|
|
Utils::LanguageExtensions languageExtensions)
|
|
{
|
|
RawProjectPartFlags flags;
|
|
ToolChainInfo tcInfo;
|
|
if (language == Language::C) {
|
|
flags = rawProjectPart.flagsForC;
|
|
tcInfo = m_projectUpdateInfo.cToolChainInfo;
|
|
}
|
|
// Use Cxx toolchain for C projects without C compiler in kit and for C++ code
|
|
if (!tcInfo.isValid()) {
|
|
flags = rawProjectPart.flagsForCxx;
|
|
tcInfo = m_projectUpdateInfo.cxxToolChainInfo;
|
|
}
|
|
|
|
ProjectPart::Ptr part(templateProjectPart->copy());
|
|
part->displayName = partName;
|
|
part->files = projectFiles;
|
|
part->toolchainType = tcInfo.type;
|
|
part->isMsvc2015Toolchain = tcInfo.isMsvc2015ToolChain;
|
|
part->toolChainWordWidth = tcInfo.wordWidth == 64 ? ProjectPart::WordWidth64Bit
|
|
: ProjectPart::WordWidth32Bit;
|
|
part->toolChainInstallDir = tcInfo.installDir;
|
|
part->toolChainTargetTriple = tcInfo.targetTriple;
|
|
part->extraCodeModelFlags = tcInfo.extraCodeModelFlags;
|
|
part->compilerFlags = flags.commandLineFlags;
|
|
part->warningFlags = flags.warningFlags;
|
|
part->language = language;
|
|
part->languageExtensions = flags.languageExtensions;
|
|
|
|
// Toolchain macros and language version
|
|
if (tcInfo.macroInspectionRunner) {
|
|
auto macroInspectionReport = tcInfo.macroInspectionRunner(flags.commandLineFlags);
|
|
part->toolChainMacros = macroInspectionReport.macros;
|
|
part->languageVersion = macroInspectionReport.languageVersion;
|
|
// No compiler set in kit.
|
|
} else if (language == Language::C) {
|
|
part->languageVersion = Utils::LanguageVersion::LatestC;
|
|
} else {
|
|
part->languageVersion = Utils::LanguageVersion::LatestCxx;
|
|
}
|
|
|
|
// Header paths
|
|
if (tcInfo.headerPathsRunner) {
|
|
const HeaderPaths builtInHeaderPaths
|
|
= tcInfo.headerPathsRunner(flags.commandLineFlags,
|
|
tcInfo.sysRootPath,
|
|
tcInfo.targetTriple);
|
|
|
|
HeaderPaths &headerPaths = part->headerPaths;
|
|
for (const HeaderPath &header : builtInHeaderPaths) {
|
|
const HeaderPath headerPath{header.path, header.type};
|
|
if (!headerPaths.contains(headerPath))
|
|
headerPaths.push_back(headerPath);
|
|
}
|
|
}
|
|
|
|
part->languageExtensions |= languageExtensions;
|
|
part->updateLanguageFeatures();
|
|
|
|
return part;
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace CppTools
|