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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangtools/virtualfilesystemoverlay.h
	src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
	src/plugins/qmldesigner/designercore/model/abstractview.cpp

Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
This commit is contained in:
Eike Ziller
2020-08-31 14:49:19 +02:00
parent b5e2485fbf e8eafd85ee
commit 6477a07654
89 changed files with 1247 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -75,7 +75,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit
// QbsBuildConfiguration:
// ---------------------------------------------------------------------------
QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id)
{
setConfigWidgetHasFrame(true);

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
View File

@@ -62,7 +62,7 @@ class QbsBuildConfiguration final : public ProjectExplorer::BuildConfiguration
Q_OBJECT
friend class ProjectExplorer::BuildConfigurationFactory;
QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
QbsBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
~QbsBuildConfiguration() final;
public:

2
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -136,7 +136,7 @@ private:
// QbsBuildStep:
// --------------------------------------------------------------------
QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) :
QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) :
BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Build"));

2
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -51,7 +51,7 @@ public:
ExpandVariables
};
QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
~QbsBuildStep() override;
QVariantMap qbsConfiguration(VariableHandling variableHandling) const;

2
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -49,7 +49,7 @@ namespace Internal {
// QbsCleanStep:
// --------------------------------------------------------------------
QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id)
QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Utils::Id id)
: BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Clean"));

2
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -41,7 +41,7 @@ class QbsCleanStep : public ProjectExplorer::BuildStep
Q_OBJECT
public:
QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
~QbsCleanStep() override;
QbsBuildStepData stepData() const;

10
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -61,7 +61,7 @@ const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
// QbsInstallStep:
// --------------------------------------------------------------------
QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id)
QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Utils::Id id)
: BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Install"));
@@ -89,16 +89,16 @@ QbsInstallStep::~QbsInstallStep()
bool QbsInstallStep::init()
{
QTC_ASSERT(!buildSystem()->isParsing() && !m_session, return false);
QTC_ASSERT(!target()->buildSystem()->isParsing() && !m_session, return false);
return true;
}
void QbsInstallStep::doRun()
{
m_session = static_cast<QbsBuildSystem *>(buildSystem())->session();
m_session = static_cast<QbsBuildSystem *>(target()->buildSystem())->session();
QJsonObject request;
request.insert("type", "install");
request.insert("type", "install-project");
request.insert("install-root", installRoot());
request.insert("clean-install-root", m_cleanInstallRoot->value());
request.insert("keep-going", m_keepGoing->value());
@@ -128,7 +128,7 @@ QString QbsInstallStep::installRoot() const
const QbsBuildConfiguration *QbsInstallStep::buildConfig() const
{
return static_cast<QbsBuildConfiguration *>(buildConfiguration());
return static_cast<QbsBuildConfiguration *>(target()->activeBuildConfiguration());
}
void QbsInstallStep::installDone(const ErrorInfo &error)

2
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -42,7 +42,7 @@ class QbsInstallStep : public ProjectExplorer::BuildStep
Q_OBJECT
public:
QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
~QbsInstallStep() override;
QString installRoot() const;

6
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -163,9 +163,9 @@ void QbsProfilesSettingsWidget::refreshKitsList()
m_ui.propertiesView->setModel(nullptr);
m_model.reload();
m_ui.profileValueLabel->clear();
Core::Id currentId;
Utils::Id currentId;
if (m_ui.kitsComboBox->count() > 0)
currentId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData());
currentId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData());
m_ui.kitsComboBox->clear();
int newCurrentIndex = -1;
QList<Kit *> validKits = KitManager::kits();
@@ -191,7 +191,7 @@ void QbsProfilesSettingsWidget::displayCurrentProfile()
m_ui.propertiesView->setModel(nullptr);
if (m_ui.kitsComboBox->currentIndex() == -1)
return;
const Core::Id kitId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData());
const Utils::Id kitId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData());
const Kit * const kit = KitManager::kit(kitId);
QTC_ASSERT(kit, return);
const QString profileName = QbsProfileManager::ensureProfileForKit(kit);

1
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -40,7 +40,6 @@
#include <coreplugin/documentmanager.h>
#include <coreplugin/icontext.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h>

3
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -35,6 +35,7 @@
#include <projectexplorer/task.h>
#include <utils/environment.h>
#include <utils/id.h>
#include <QFutureWatcher>
#include <QHash>
@@ -92,7 +93,7 @@ public:
const QString &filePath, const QString &newFilePath) final;
QStringList filesGeneratedFrom(const QString &sourceFile) const final;
QVariant additionalData(Core::Id id) const final;
QVariant additionalData(Utils::Id id) const final;
bool isProjectEditable() const;
bool addFilesToProduct(const QStringList &filePaths,

11
src/plugins/qbsprojectmanager/qbssession.cpp
View File

@@ -268,7 +268,7 @@ QString QbsSession::errorString(QbsSession::Error error)
case Error::QbsFailedToStart:
return tr("The qbs process failed to start.");
case Error::ProtocolError:
return tr("The qbs process sent invalid data.");
return tr("The qbs process sent unexpected data.");
case Error::VersionMismatch:
return tr("The qbs API level is not compatible with "
"what %1 expects.").arg(Core::Constants::IDE_DISPLAY_NAME);
@@ -536,6 +536,15 @@ void QbsSession::handlePacket(const QJsonObject &packet)
} else if (type == "run-environment") {
d->reply = packet;
d->eventLoop.quit();
} else if (type == "protocol-error") {
const ErrorInfo errorInfo = ErrorInfo(packet.value("error").toObject());
// TODO: This loop occurs a lot. Factor it out.
for (const ErrorInfoItem &item : errorInfo.items) {
TaskHub::addTask(BuildSystemTask(Task::Error, item.description,
item.filePath, item.line));
}
setError(Error::ProtocolError);
}
}