ProjectExplorer: Remove Run{Control,Configuration}::abi

Unused now, and arguably not a valid concept anymore.
A run control may consist of different runworkers,
'operating' on different systems.

Since the removed RunConfiguration::abi() implementation uses
only public Target ABI, user code could revive that locally
in case it was needed again.

Change-Id: I658c6e88b4a1aec18bf4de91fc86230552bc0710
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-09-18 12:57:34 +02:00
parent db4e7b2224
commit f18176d6c0
6 changed files with 0 additions and 35 deletions

View File

@@ -278,11 +278,6 @@ QString CustomExecutableRunConfiguration::defaultDisplayName() const
return tr("Run %1").arg(QDir::toNativeSeparators(rawExecutable())); return tr("Run %1").arg(QDir::toNativeSeparators(rawExecutable()));
} }
Abi CustomExecutableRunConfiguration::abi() const
{
return Abi(); // return an invalid ABI: We do not know what we will end up running!
}
// Factory // Factory
CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory() : CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory() :

View File

@@ -45,7 +45,6 @@ public:
/** Returns whether this runconfiguration ever was configured with an executable /** Returns whether this runconfiguration ever was configured with an executable
*/ */
bool isConfigured() const override; bool isConfigured() const override;
Abi abi() const override;
ConfigurationState ensureConfigured(QString *errorMessage) override; ConfigurationState ensureConfigured(QString *errorMessage) override;
QString defaultDisplayName() const; QString defaultDisplayName() const;

View File

@@ -310,17 +310,6 @@ QVariantMap RunConfiguration::toMap() const
return map; return map;
} }
Abi RunConfiguration::abi() const
{
BuildConfiguration *bc = target()->activeBuildConfiguration();
if (!bc)
return Abi::hostAbi();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), Constants::CXX_LANGUAGE_ID);
if (!tc)
return Abi::hostAbi();
return tc->targetAbi();
}
BuildTargetInfo RunConfiguration::buildTargetInfo() const BuildTargetInfo RunConfiguration::buildTargetInfo() const
{ {
return target()->applicationTargets().buildTargetInfo(m_buildKey); return target()->applicationTargets().buildTargetInfo(m_buildKey);
@@ -1334,13 +1323,6 @@ Utils::Icon RunControl::icon() const
return d->icon; return d->icon;
} }
Abi RunControl::abi() const
{
if (const RunConfiguration *rc = d->runConfiguration.data())
return rc->abi();
return Abi();
}
IDevice::ConstPtr RunControl::device() const IDevice::ConstPtr RunControl::device() const
{ {
return d->device; return d->device;

View File

@@ -46,7 +46,6 @@
namespace Utils { class OutputFormatter; } namespace Utils { class OutputFormatter; }
namespace ProjectExplorer { namespace ProjectExplorer {
class Abi;
class BuildConfiguration; class BuildConfiguration;
class GlobalOrProjectAspect; class GlobalOrProjectAspect;
class Node; class Node;
@@ -172,7 +171,6 @@ public:
QVariantMap toMap() const override; QVariantMap toMap() const override;
virtual Runnable runnable() const; virtual Runnable runnable() const;
virtual Abi abi() const;
// Return a handle to the build system target that created this run configuration. // Return a handle to the build system target that created this run configuration.
// May return an empty string if no target built the executable! // May return an empty string if no target built the executable!
@@ -439,7 +437,6 @@ public:
Utils::ProcessHandle applicationProcessHandle() const; Utils::ProcessHandle applicationProcessHandle() const;
void setApplicationProcessHandle(const Utils::ProcessHandle &handle); void setApplicationProcessHandle(const Utils::ProcessHandle &handle);
Abi abi() const;
IDevice::ConstPtr device() const; IDevice::ConstPtr device() const;
RunConfiguration *runConfiguration() const; RunConfiguration *runConfiguration() const;

View File

@@ -374,13 +374,6 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
return args; return args;
} }
Abi QmlProjectRunConfiguration::abi() const
{
Abi hostAbi = Abi::hostAbi();
return Abi(hostAbi.architecture(), hostAbi.os(), hostAbi.osFlavor(),
Abi::RuntimeQmlFormat, hostAbi.wordWidth());
}
void QmlProjectRunConfiguration::updateEnabledState() void QmlProjectRunConfiguration::updateEnabledState()
{ {
bool qmlFileFound = m_mainQmlFileAspect->isQmlFilePresent(); bool qmlFileFound = m_mainQmlFileAspect->isQmlFilePresent();

View File

@@ -44,7 +44,6 @@ public:
private: private:
ProjectExplorer::Runnable runnable() const final; ProjectExplorer::Runnable runnable() const final;
QString disabledReason() const final; QString disabledReason() const final;
ProjectExplorer::Abi abi() const final;
void updateEnabledState() final; void updateEnabledState() final;
QString mainScript() const; QString mainScript() const;