Debugger: Remove QML port settings in run configs

Obsolete since the invention of PortGatherers.

Change-Id: I34c80b2408213c2d6bd0d893763be4dffc2db7ea
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

src/plugins/debugger/debuggerrunconfigurationaspect.cpp

@@ -40,7 +40,6 @@
 #include <projectexplorer/buildsteplist.h>
 
 #include <QCheckBox>
-#include <QSpinBox>
 #include <QDebug>
 #include <QFormLayout>
 #include <QLabel>
@@ -50,7 +49,6 @@ const char USE_CPP_DEBUGGER_KEY[] = "RunConfiguration.UseCppDebugger";
 const char USE_CPP_DEBUGGER_AUTO_KEY[] = "RunConfiguration.UseCppDebuggerAuto";
 const char USE_QML_DEBUGGER_KEY[] = "RunConfiguration.UseQmlDebugger";
 const char USE_QML_DEBUGGER_AUTO_KEY[] = "RunConfiguration.UseQmlDebuggerAuto";
-const char QML_DEBUG_SERVER_PORT_KEY[] = "RunConfiguration.QmlDebugServerPort";
 const char USE_MULTIPROCESS_KEY[] = "RunConfiguration.UseMultiProcess";
 const char OVERRIDE_STARTUP_KEY[] = "RunConfiguration.OverrideDebuggerStartup";
 
@@ -76,9 +74,7 @@ public:
     void update();
 
     void useCppDebuggerClicked(bool on);
-    void useQmlDebuggerToggled(bool on);
     void useQmlDebuggerClicked(bool on);
-    void qmlDebugServerPortChanged(int port);
     void useMultiProcessToggled(bool on);
 
 public:
@@ -86,8 +82,6 @@ public:
 
     QCheckBox *m_useCppDebugger;
     QCheckBox *m_useQmlDebugger;
-    QSpinBox *m_debugServerPort;
-    QLabel *m_debugServerPortLabel;
     QLabel *m_qmlDebuggerInfoLabel;
     QLabel *m_overrideStartupLabel;
     QTextEdit *m_overrideStartupText;
@@ -101,13 +95,6 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect
     m_useCppDebugger = new QCheckBox(tr("Enable C++"), this);
     m_useQmlDebugger = new QCheckBox(tr("Enable QML"), this);
 
-    m_debugServerPort = new QSpinBox(this);
-    m_debugServerPort->setMinimum(1);
-    m_debugServerPort->setMaximum(65535);
-
-    m_debugServerPortLabel = new QLabel(tr("Debug port:"), this);
-    m_debugServerPortLabel->setBuddy(m_debugServerPort);
-
     m_qmlDebuggerInfoLabel = new QLabel(tr("<a href=\""
         "qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
         "\">What are the prerequisites?</a>"));
@@ -122,14 +109,10 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect
 
     connect(m_qmlDebuggerInfoLabel, &QLabel::linkActivated,
             [](const QString &link) { Core::HelpManager::showHelpUrl(link); });
-    connect(m_useQmlDebugger, &QAbstractButton::toggled,
-            this, &DebuggerRunConfigWidget::useQmlDebuggerToggled);
     connect(m_useQmlDebugger, &QAbstractButton::clicked,
             this, &DebuggerRunConfigWidget::useQmlDebuggerClicked);
     connect(m_useCppDebugger, &QAbstractButton::clicked,
             this, &DebuggerRunConfigWidget::useCppDebuggerClicked);
-    connect(m_debugServerPort, QOverload<int>::of(&QSpinBox::valueChanged),
-            this, &DebuggerRunConfigWidget::qmlDebugServerPortChanged);
     connect(m_overrideStartupText, &QTextEdit::textChanged,
             this, [this] { m_aspect->d.overrideStartup = m_overrideStartupText->toPlainText(); });
     connect(m_useMultiProcess, &QAbstractButton::toggled,
@@ -138,8 +121,6 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect
     auto qmlLayout = new QHBoxLayout;
     qmlLayout->setContentsMargins(0, 0, 0, 0);
     qmlLayout->addWidget(m_useQmlDebugger);
-    qmlLayout->addWidget(m_debugServerPortLabel);
-    qmlLayout->addWidget(m_debugServerPort);
     qmlLayout->addWidget(m_qmlDebuggerInfoLabel);
     qmlLayout->addStretch();
 
@@ -170,21 +151,11 @@ void DebuggerRunConfigWidget::update()
     m_useCppDebugger->setChecked(m_aspect->useCppDebugger());
     m_useQmlDebugger->setChecked(m_aspect->useQmlDebugger());
 
-    m_debugServerPort->setValue(m_aspect->qmlDebugServerPort());
-
     m_useMultiProcess->setChecked(m_aspect->useMultiProcess());
 
-    m_debugServerPortLabel->setVisible(!m_aspect->isQmlDebuggingSpinboxSuppressed());
-    m_debugServerPort->setVisible(!m_aspect->isQmlDebuggingSpinboxSuppressed());
-
     m_overrideStartupText->setText(m_aspect->overrideStartup());
 }
 
-void DebuggerRunConfigWidget::qmlDebugServerPortChanged(int port)
-{
-    m_aspect->d.qmlDebugServerPort = port;
-}
-
 void DebuggerRunConfigWidget::useCppDebuggerClicked(bool on)
 {
     m_aspect->d.useCppDebugger = on ? EnabledLanguage : DisabledLanguage;
@@ -194,12 +165,6 @@ void DebuggerRunConfigWidget::useCppDebuggerClicked(bool on)
     }
 }
 
-void DebuggerRunConfigWidget::useQmlDebuggerToggled(bool on)
-{
-    m_debugServerPort->setEnabled(on);
-    m_debugServerPortLabel->setEnabled(on);
-}
-
 void DebuggerRunConfigWidget::useQmlDebuggerClicked(bool on)
 {
     m_aspect->d.useQmlDebugger = on ? EnabledLanguage : DisabledLanguage;
@@ -267,11 +232,6 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
     return d.useQmlDebugger == EnabledLanguage;
 }
 
-uint DebuggerRunConfigurationAspect::qmlDebugServerPort() const
-{
-    return d.qmlDebugServerPort;
-}
-
 bool DebuggerRunConfigurationAspect::useMultiProcess() const
 {
     return d.useMultiProcess;
@@ -282,15 +242,6 @@ void DebuggerRunConfigurationAspect::setUseMultiProcess(bool value)
     d.useMultiProcess = value;
 }
 
-bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const
-{
-    Kit *k = m_target->kit();
-    IDevice::ConstPtr dev = DeviceKitAspect::device(k);
-    if (dev.isNull())
-        return false;
-    return dev->canAutoDetectPorts();
-}
-
 QString DebuggerRunConfigurationAspect::overrideStartup() const
 {
     return d.overrideStartup;
@@ -312,7 +263,6 @@ void DebuggerRunConfigurationAspect::toMap(QVariantMap &map) const
     map.insert(USE_CPP_DEBUGGER_AUTO_KEY, d.useCppDebugger == AutoEnabledLanguage);
     map.insert(USE_QML_DEBUGGER_KEY, d.useQmlDebugger == EnabledLanguage);
     map.insert(USE_QML_DEBUGGER_AUTO_KEY, d.useQmlDebugger == AutoEnabledLanguage);
-    map.insert(QML_DEBUG_SERVER_PORT_KEY, d.qmlDebugServerPort);
     map.insert(USE_MULTIPROCESS_KEY, d.useMultiProcess);
     map.insert(OVERRIDE_STARTUP_KEY, d.overrideStartup);
 }

src/plugins/debugger/debuggerrunconfigurationaspect.h

@@ -46,9 +46,6 @@ public:
     DebuggerLanguageStatus useCppDebugger = AutoEnabledLanguage;
     DebuggerLanguageStatus useQmlDebugger = AutoEnabledLanguage;
 
-    const uint QML_DEFAULT_DEBUG_SERVER_PORT = 3768;
-    uint qmlDebugServerPort = QML_DEFAULT_DEBUG_SERVER_PORT;
-
     bool useMultiProcess = false;
     QString overrideStartup;
 };
@@ -67,10 +64,8 @@ public:
     bool useCppDebugger() const;
     bool useQmlDebugger() const;
     void setUseQmlDebugger(bool value);
-    uint qmlDebugServerPort() const;
     bool useMultiProcess() const;
     void setUseMultiProcess(bool on);
-    bool isQmlDebuggingSpinboxSuppressed() const;
     QString overrideStartup() const;
 
     int portsUsedByDebugger() const;