debugger: use host from profile for the attach to qml option

Change-Id: I81903ba752b9758fb4b9e342d40ac756716caecf
Reviewed-by: hjk <qthjk@ovi.com>

3 files changed, 4 insertions, 32 deletions

diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 55f112a9c0..399f96dbb9 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -432,7 +432,6 @@ void StartApplicationDialog::setParameters(const StartApplicationParameters &p)
 class AttachToQmlPortDialogPrivate
 {
 public:
-    QLineEdit *hostLineEdit;
     QSpinBox *portSpinBox;
     ProfileChooser *profileChooser;
 };
@@ -444,10 +443,7 @@ AttachToQmlPortDialog::AttachToQmlPortDialog(QWidget *parent)
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Start Debugger"));
 
-    d->profileChooser = new ProfileChooser(this, ProfileChooser::RemoteDebugging);
-
-    d->hostLineEdit = new QLineEdit(this);
-    d->hostLineEdit->setText(QString::fromUtf8("localhost"));
+    d->profileChooser = new ProfileChooser(this);
 
     d->portSpinBox = new QSpinBox(this);
     d->portSpinBox->setMaximum(65535);
@@ -459,7 +455,6 @@ AttachToQmlPortDialog::AttachToQmlPortDialog(QWidget *parent)
 
     QFormLayout *formLayout = new QFormLayout();
     formLayout->addRow(tr("Target:"), d->profileChooser);
-    formLayout->addRow(tr("&Host:"), d->hostLineEdit);
     formLayout->addRow(tr("&Port:"), d->portSpinBox);
 
     QVBoxLayout *verticalLayout = new QVBoxLayout(this);
@@ -475,16 +470,6 @@ AttachToQmlPortDialog::~AttachToQmlPortDialog()
     delete d;
 }
 
-void AttachToQmlPortDialog::setHost(const QString &host)
-{
-    d->hostLineEdit->setText(host);
-}
-
-QString AttachToQmlPortDialog::host() const
-{
-    return d->hostLineEdit->text();
-}
-
 void AttachToQmlPortDialog::setPort(const int port)
 {
     d->portSpinBox->setValue(port);
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index 2c25b317b4..49e32347a2 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -91,9 +91,6 @@ public:
     explicit AttachToQmlPortDialog(QWidget *parent);
     ~AttachToQmlPortDialog();
 
-    QString host() const;
-    void setHost(const QString &host);
-
     int port() const;
     void setPort(const int port);
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d737a70e37..9efea5a1d2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1606,19 +1606,11 @@ void DebuggerPluginPrivate::attachToQmlPort()
     DebuggerStartParameters sp;
     AttachToQmlPortDialog dlg(mainWindow());
 
-    const QVariant qmlServerAddress = configValue(_("LastQmlServerAddress"));
-    if (qmlServerAddress.isValid()) {
-        dlg.setHost(qmlServerAddress.toString());
-    } else {
-        dlg.setHost(sp.qmlServerAddress);
-    }
-
     const QVariant qmlServerPort = configValue(_("LastQmlServerPort"));
-    if (qmlServerPort.isValid()) {
+    if (qmlServerPort.isValid())
         dlg.setPort(qmlServerPort.toInt());
-    } else {
+    else
         dlg.setPort(sp.qmlServerPort);
-    }
 
     const QVariant profileId = configValue(_("LastProfile"));
     if (profileId.isValid())
@@ -1627,14 +1619,12 @@ void DebuggerPluginPrivate::attachToQmlPort()
     if (dlg.exec() != QDialog::Accepted)
         return;
 
-    setConfigValue(_("LastQmlServerAddress"), dlg.host());
     setConfigValue(_("LastQmlServerPort"), dlg.port());
     setConfigValue(_("LastProfile"), dlg.profile()->id().toString());
 
     fillParameters(&sp, dlg.profile());
-    sp.qmlServerAddress = dlg.host();
+    sp.qmlServerAddress = sp.connParams.host;
     sp.qmlServerPort = dlg.port();
-
     sp.startMode = AttachToRemoteProcess;
     sp.closeMode = KillAtClose;
     sp.languages = QmlLanguage;