QMake: Use new ExecutableAspect

Change-Id: I87af8de1a6bec216ebafaa6d7832e00facc9601a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp

@@ -39,7 +39,6 @@
 #include <qtsupport/qtsupportconstants.h>
 
 #include <utils/fileutils.h>
-#include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
@@ -51,8 +50,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QFormLayout>
-#include <QLabel>
-#include <QLineEdit>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -72,6 +69,7 @@ const char USE_LIBRARY_SEARCH_PATH[] = "QmakeProjectManager.QmakeRunConfiguratio
 DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *target)
     : RunConfiguration(target, QMAKE_RC_PREFIX)
 {
+    addExtraAspect(new ExecutableAspect(this));
     addExtraAspect(new LocalEnvironmentAspect(this, [](RunConfiguration *rc, Environment &env) {
                        static_cast<DesktopQmakeRunConfiguration *>(rc)->addToBaseEnvironment(env);
                    }));
@@ -104,6 +102,8 @@ void DesktopQmakeRunConfiguration::updateTargetInformation()
     if (!terminalAspect->isUserSet())
         terminalAspect->setUseTerminal(bti.usesTerminal);
 
+    extraAspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
+
     emit effectiveTargetInformationChanged();
 }
 
@@ -118,10 +118,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
     toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     toplayout->setMargin(0);
 
-    m_executableLineLabel = new QLabel(this);
+    m_qmakeRunConfiguration->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
-    m_executableLineLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    toplayout->addRow(tr("Executable:"), m_executableLineLabel);
-
     m_qmakeRunConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
     m_qmakeRunConfiguration->extraAspect<WorkingDirectoryAspect>()->addToMainConfigurationWidget(this, toplayout);
     m_qmakeRunConfiguration->extraAspect<TerminalAspect>()->addToMainConfigurationWidget(this, toplayout);
@@ -158,11 +155,8 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
             this, &DesktopQmakeRunConfigurationWidget::usingDyldImageSuffixChanged);
     connect(qmakeRunConfiguration, &DesktopQmakeRunConfiguration::usingLibrarySearchPathChanged,
             this, &DesktopQmakeRunConfigurationWidget::usingLibrarySearchPathChanged);
-    connect(qmakeRunConfiguration, &DesktopQmakeRunConfiguration::effectiveTargetInformationChanged,
-            this, &DesktopQmakeRunConfigurationWidget::effectiveTargetInformationChanged, Qt::QueuedConnection);
 
     Core::VariableChooser::addSupportForChildWidgets(this, m_qmakeRunConfiguration->macroExpander());
-    effectiveTargetInformationChanged();
 }
 
 void DesktopQmakeRunConfigurationWidget::usingDyldImageSuffixToggled(bool state)
@@ -191,11 +185,6 @@ void DesktopQmakeRunConfigurationWidget::usingLibrarySearchPathChanged(bool stat
         m_usingLibrarySearchPath->setChecked(state);
 }
 
-void DesktopQmakeRunConfigurationWidget::effectiveTargetInformationChanged()
-{
-    m_executableLineLabel->setText(QDir::toNativeSeparators(m_qmakeRunConfiguration->executable()));
-}
-
 QWidget *DesktopQmakeRunConfiguration::createConfigurationWidget()
 {
     return wrapWidget(new DesktopQmakeRunConfigurationWidget(this));
@@ -204,7 +193,7 @@ QWidget *DesktopQmakeRunConfiguration::createConfigurationWidget()
 Runnable DesktopQmakeRunConfiguration::runnable() const
 {
     StandardRunnable r;
-    r.executable = executable();
+    r.executable = extraAspect<ExecutableAspect>()->executable().toString();
     r.commandLineArguments = extraAspect<ArgumentsAspect>()->arguments();
     r.workingDirectory = extraAspect<WorkingDirectoryAspect>()->workingDirectory().toString();
     r.environment = extraAspect<LocalEnvironmentAspect>()->environment();
@@ -243,12 +232,6 @@ void DesktopQmakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreat
     updateTargetInformation();
 }
 
-QString DesktopQmakeRunConfiguration::executable() const
-{
-    BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey());
-    return bti.targetFilePath.toString();
-}
-
 bool DesktopQmakeRunConfiguration::isUsingDyldImageSuffix() const
 {
     return m_isUsingDyldImageSuffix;

src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h

@@ -51,7 +51,6 @@ public:
     QWidget *createConfigurationWidget() override;
 
     ProjectExplorer::Runnable runnable() const override;
-    QString executable() const;
 
     bool isUsingDyldImageSuffix() const;
     void setUsingDyldImageSuffix(bool state);
@@ -99,7 +98,6 @@ public:
     explicit DesktopQmakeRunConfigurationWidget(DesktopQmakeRunConfiguration *qmakeRunConfiguration);
 
 private:
-    void effectiveTargetInformationChanged();
     void usingDyldImageSuffixToggled(bool);
     void usingDyldImageSuffixChanged(bool);
     void usingLibrarySearchPathToggled(bool state);
@@ -108,7 +106,6 @@ private:
 private:
     DesktopQmakeRunConfiguration *m_qmakeRunConfiguration = nullptr;
     bool m_ignoreChange = false;
-    QLabel *m_executableLineLabel = nullptr;
     QCheckBox *m_usingDyldImageSuffix = nullptr;
     QCheckBox *m_usingLibrarySearchPath = nullptr;
     QLineEdit *m_qmlDebugPort = nullptr;