diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index 1c2b315095c..cecf44be2cd 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -278,11 +278,6 @@ QString CustomExecutableRunConfiguration::defaultDisplayName() const 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 CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory() : diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h index c8b9d8144b7..6abd0f3185e 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h @@ -45,7 +45,6 @@ public: /** Returns whether this runconfiguration ever was configured with an executable */ bool isConfigured() const override; - Abi abi() const override; ConfigurationState ensureConfigured(QString *errorMessage) override; QString defaultDisplayName() const; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index e6f0302bdf8..d5ec08471f7 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -310,17 +310,6 @@ QVariantMap RunConfiguration::toMap() const 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 { return target()->applicationTargets().buildTargetInfo(m_buildKey); @@ -1334,13 +1323,6 @@ Utils::Icon RunControl::icon() const return d->icon; } -Abi RunControl::abi() const -{ - if (const RunConfiguration *rc = d->runConfiguration.data()) - return rc->abi(); - return Abi(); -} - IDevice::ConstPtr RunControl::device() const { return d->device; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 9a973b42ebb..c31aeb9de0d 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -46,7 +46,6 @@ namespace Utils { class OutputFormatter; } namespace ProjectExplorer { -class Abi; class BuildConfiguration; class GlobalOrProjectAspect; class Node; @@ -172,7 +171,6 @@ public: QVariantMap toMap() const override; virtual Runnable runnable() const; - virtual Abi abi() const; // Return a handle to the build system target that created this run configuration. // May return an empty string if no target built the executable! @@ -439,7 +437,6 @@ public: Utils::ProcessHandle applicationProcessHandle() const; void setApplicationProcessHandle(const Utils::ProcessHandle &handle); - Abi abi() const; IDevice::ConstPtr device() const; RunConfiguration *runConfiguration() const; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 55e32ec508e..9ba68b556a1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -374,13 +374,6 @@ QString QmlProjectRunConfiguration::commandLineArguments() const 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() { bool qmlFileFound = m_mainQmlFileAspect->isQmlFilePresent(); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index b67e4238f0c..adfd3103a78 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -44,7 +44,6 @@ public: private: ProjectExplorer::Runnable runnable() const final; QString disabledReason() const final; - ProjectExplorer::Abi abi() const final; void updateEnabledState() final; QString mainScript() const;