feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I81903ba752b9758fb4b9e342d40ac756716caecf
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-15 16:20:11 +02:00
parent 6228fb1d78
commit f880c0e5b5
3 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -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);

3
src/plugins/debugger/debuggerdialogs.h
View File

@@ -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);

16
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -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;