aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r--src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp23
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp5
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildconfiguration.h6
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildstep.cpp12
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.cpp10
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectimporter.cpp6
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp10
9 files changed, 25 insertions, 51 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 4f373b8ee3..9f0b648dc6 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -52,6 +52,8 @@
#include <QRegularExpression>
#include <QSettings>
+using namespace ProjectExplorer;
+
namespace QbsProjectManager {
using namespace Constants;
@@ -253,27 +255,24 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
{
QVariantMap data = defaultData;
- const QString sysroot = ProjectExplorer::SysRootKitAspect::sysRoot(k).toUserOutput();
+ const QString sysroot = SysRootKitAspect::sysRoot(k).toUserOutput();
if (!sysroot.isEmpty())
data.insert(QLatin1String(QBS_SYSROOT), sysroot);
- ProjectExplorer::ToolChain *tcC
- = ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID);
- ProjectExplorer::ToolChain *tcCxx
- = ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+ ToolChain *tcC = ToolChainKitAspect::cToolChain(k);
+ ToolChain *tcCxx = ToolChainKitAspect::cxxToolChain(k);
if (!tcC && !tcCxx)
return data;
- ProjectExplorer::ToolChain *mainTc = tcCxx ? tcCxx : tcC;
+ ToolChain *mainTc = tcCxx ? tcCxx : tcC;
- ProjectExplorer::Abi targetAbi = mainTc->targetAbi();
+ Abi targetAbi = mainTc->targetAbi();
auto archs = architectures(mainTc);
if (!archs.isEmpty())
data.insert(QLatin1String(QBS_ARCHITECTURES), archs);
- if (mainTc->targetAbi() !=
- ProjectExplorer::Abi::abiFromTargetTriplet(mainTc->originalTargetTriple())
- || targetAbi.osFlavor() == ProjectExplorer::Abi::AndroidLinuxFlavor) {
+ if (mainTc->targetAbi() != Abi::abiFromTargetTriplet(mainTc->originalTargetTriple())
+ || targetAbi.osFlavor() == Abi::AndroidLinuxFlavor) {
data.insert(QLatin1String(QBS_ARCHITECTURE), architecture(mainTc->targetAbi()));
} else if (archs.count() == 1) {
data.insert(QLatin1String(QBS_ARCHITECTURE), archs.first());
@@ -281,8 +280,8 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
data.insert(QLatin1String(QBS_TARGETPLATFORM), targetPlatform(targetAbi, k));
QStringList toolchain = toolchainList(mainTc);
- if (targetAbi.osFlavor() == ProjectExplorer::Abi::AndroidLinuxFlavor) {
- const ProjectExplorer::IDevice::ConstPtr dev = ProjectExplorer::DeviceKitAspect::device(k);
+ if (targetAbi.osFlavor() == Abi::AndroidLinuxFlavor) {
+ const IDevice::ConstPtr dev = DeviceKitAspect::device(k);
if (dev) {
const QString sdkDir = k->value(Android::Constants::ANDROID_KIT_SDK).toString();
if (!sdkDir.isEmpty())
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index f2aac00591..eb6be29f10 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -311,11 +311,6 @@ QString QbsBuildConfiguration::equivalentCommandLine(const QbsBuildStepData &ste
return commandLine.arguments();
}
-bool QbsBuildConfiguration::isQmlDebuggingEnabled() const
-{
- return qmlDebuggingSetting() == TriState::Enabled;
-}
-
TriState QbsBuildConfiguration::qmlDebuggingSetting() const
{
return aspect<QtSupport::QmlDebuggingAspect>()->setting();
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
index 96b66e2f47..4f9454ea1c 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -61,11 +61,6 @@ class QbsBuildConfiguration final : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
- // used in DebuggerRunConfigurationAspect
- Q_PROPERTY(bool linkQmlDebuggingLibrary
- READ isQmlDebuggingEnabled
- NOTIFY qbsConfigurationChanged)
-
friend class ProjectExplorer::BuildConfigurationFactory;
QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
~QbsBuildConfiguration() final;
@@ -90,7 +85,6 @@ public:
QString configurationName() const;
QString equivalentCommandLine(const QbsBuildStepData &stepData) const;
- bool isQmlDebuggingEnabled() const;
ProjectExplorer::TriState qmlDebuggingSetting() const;
ProjectExplorer::TriState qtQuickCompilerSetting() const;
ProjectExplorer::TriState separateDebugInfoSetting() const;
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 9827cf672f..a47c1c972f 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -234,7 +234,7 @@ QVariantMap QbsBuildStep::qbsConfiguration(VariableHandling variableHandling) co
Constants::QBS_CONFIG_QUICK_COMPILER_KEY);
if (variableHandling == ExpandVariables) {
- const MacroExpander * const expander = buildConfiguration()->macroExpander();
+ const MacroExpander * const expander = macroExpander();
for (auto it = config.begin(), end = config.end(); it != end; ++it) {
const QString rawString = it.value().toString();
const QString expandedString = expander->expand(rawString);
@@ -273,7 +273,7 @@ Utils::FilePath QbsBuildStep::installRoot(VariableHandling variableHandling) con
return Utils::FilePath::fromString(root);
QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate();
if (variableHandling == VariableHandling::ExpandVariables)
- defaultInstallDir = buildConfiguration()->macroExpander()->expand(defaultInstallDir);
+ defaultInstallDir = macroExpander()->expand(defaultInstallDir);
return FilePath::fromString(defaultInstallDir);
}
@@ -411,7 +411,7 @@ QString QbsBuildStep::buildVariant() const
QbsBuildSystem *QbsBuildStep::qbsBuildSystem() const
{
- return static_cast<QbsBuildSystem *>(buildConfiguration()->buildSystem());
+ return static_cast<QbsBuildSystem *>(buildSystem());
}
void QbsBuildStep::setBuildVariant(const QString &variant)
@@ -644,9 +644,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
auto chooser = new Core::VariableChooser(this);
chooser->addSupportedWidget(propertyEdit);
chooser->addSupportedWidget(installDirChooser->lineEdit());
- chooser->addMacroExpanderProvider([step] {
- return step->buildConfiguration()->macroExpander();
- });
+ chooser->addMacroExpanderProvider([step] { return step->macroExpander(); });
propertyEdit->setValidationFunction([this](FancyLineEdit *edit, QString *errorMessage) {
return validateProperties(edit, errorMessage);
});
@@ -867,7 +865,7 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
}
QList<Property> properties;
- const MacroExpander * const expander = step()->buildConfiguration()->macroExpander();
+ const MacroExpander * const expander = step()->macroExpander();
foreach (const QString &rawArg, argList) {
int pos = rawArg.indexOf(':');
if (pos > 0) {
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index 371cf4c8d6..f3e3164e1e 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -109,7 +109,7 @@ QbsInstallStep::~QbsInstallStep()
bool QbsInstallStep::init()
{
- QTC_ASSERT(!buildConfiguration()->buildSystem()->isParsing() && !m_session, return false);
+ QTC_ASSERT(!buildSystem()->isParsing() && !m_session, return false);
return true;
}
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index ed9488f7eb..f6c58a2bb1 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -49,8 +49,6 @@
#include <cpptools/cppprojectupdater.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/generatedcodemodelsupport.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildinfo.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildtargetinfo.h>
@@ -79,6 +77,7 @@
#include <QJsonArray>
#include <QMessageBox>
#include <QSet>
+#include <QTimer>
#include <QVariantMap>
#include <algorithm>
@@ -209,7 +208,6 @@ QbsBuildSystem::QbsBuildSystem(QbsBuildConfiguration *bc)
});
connect(m_session, &QbsSession::fileListUpdated, this, &QbsBuildSystem::delayParsing);
- m_parsingDelay.setInterval(1000); // delay parsing by 1s.
delayParsing();
connect(bc->project(), &Project::activeTargetChanged,
@@ -218,8 +216,6 @@ QbsBuildSystem::QbsBuildSystem(QbsBuildConfiguration *bc)
connect(bc->target(), &Target::activeBuildConfigurationChanged,
this, &QbsBuildSystem::delayParsing);
- connect(&m_parsingDelay, &QTimer::timeout, this, &QbsBuildSystem::triggerParsing);
-
connect(bc->project(), &Project::projectFileIsDirty, this, &QbsBuildSystem::delayParsing);
updateProjectNodes({});
}
@@ -593,7 +589,7 @@ void QbsBuildSystem::triggerParsing()
void QbsBuildSystem::delayParsing()
{
if (m_buildConfiguration->isActive())
- m_parsingDelay.start();
+ requestDelayedParse();
}
void QbsBuildSystem::parseCurrentBuildConfiguration()
@@ -631,7 +627,7 @@ void QbsBuildSystem::parseCurrentBuildConfiguration()
prepareForParsing();
- m_parsingDelay.stop();
+ cancelDelayedParseRequest();
QTC_ASSERT(!m_qbsProjectParser, return);
m_qbsProjectParser = new QbsProjectParser(this, m_qbsUpdateFutureInterface);
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index 250d544e3b..7d4a027adf 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -39,7 +39,6 @@
#include <QFutureWatcher>
#include <QHash>
#include <QJsonObject>
-#include <QTimer>
#include <functional>
@@ -149,7 +148,6 @@ private:
QSet<Core::IDocument *> m_qbsDocuments;
QJsonObject m_projectData; // TODO: Perhaps store this in the root project node instead?
- QTimer m_parsingDelay;
QbsProjectParser *m_qbsProjectParser = nullptr;
QFutureInterface<bool> *m_qbsUpdateFutureInterface = nullptr;
using TreeCreationWatcher = QFutureWatcher<QbsProjectNode *>;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 8ff3371eef..06f9812169 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -165,10 +165,8 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const
&& bgData->cxxCompilerPath.isEmpty()) {
return true;
}
- const ToolChain * const cToolchain
- = ToolChainKitAspect::toolChain(k, Constants::C_LANGUAGE_ID);
- const ToolChain * const cxxToolchain
- = ToolChainKitAspect::toolChain(k, Constants::CXX_LANGUAGE_ID);
+ const ToolChain * const cToolchain = ToolChainKitAspect::cToolChain(k);
+ const ToolChain * const cxxToolchain = ToolChainKitAspect::cxxToolChain(k);
if (!bgData->cCompilerPath.isEmpty()) {
if (!cToolchain)
return false;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index e9f8e64ea3..d0da8a47e0 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -542,17 +542,13 @@ void QbsProjectManagerPlugin::runStepsForProducts(QbsProject *project,
bc->setChangedFiles(QStringList());
bc->setProducts(products);
QList<ProjectExplorer::BuildStepList *> stepLists;
- QStringList stepListNames;
for (const Core::Id &stepType : stepTypes) {
- if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
+ if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD)
stepLists << bc->buildSteps();
- stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType);
- } else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
+ else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
stepLists << bc->cleanSteps();
- stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType);
- }
}
- BuildManager::buildLists(stepLists, stepListNames);
+ BuildManager::buildLists(stepLists);
bc->setProducts(QStringList());
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 20:45:35 +0000