forked from qt-creator/qt-creator
Qnx: Set default device host IP for physical device
Change-Id: I54fa8af84df8853c32adde1b94bc6096930e29ba Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
committed by
Nicolas Arnaud-Cormos
parent
5942b48e82
commit
8f4da818c8
@@ -45,6 +45,11 @@ using namespace Qnx::Internal;
|
||||
|
||||
namespace {
|
||||
const char DEVICENAME_FIELD_ID[] = "DeviceName";
|
||||
|
||||
QString defaultDeviceHostIp(IDevice::MachineType type)
|
||||
{
|
||||
return type == IDevice::Hardware ? QLatin1String("169.254.0.1") : QString();
|
||||
}
|
||||
}
|
||||
|
||||
BlackBerryDeviceConfigurationWizardSetupPage::BlackBerryDeviceConfigurationWizardSetupPage(QWidget *parent)
|
||||
@@ -59,7 +64,7 @@ BlackBerryDeviceConfigurationWizardSetupPage::BlackBerryDeviceConfigurationWizar
|
||||
|
||||
connect(m_ui->deviceName, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged()));
|
||||
connect(m_ui->deviceHostIp, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged()));
|
||||
connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged()));
|
||||
connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SLOT(handleMachineTypeChanged()));
|
||||
connect(m_ui->debugToken, SIGNAL(changed(QString)), this, SIGNAL(completeChanged()));
|
||||
|
||||
registerField(QLatin1String(DEVICENAME_FIELD_ID), m_ui->deviceName);
|
||||
@@ -74,9 +79,9 @@ BlackBerryDeviceConfigurationWizardSetupPage::~BlackBerryDeviceConfigurationWiza
|
||||
void BlackBerryDeviceConfigurationWizardSetupPage::initializePage()
|
||||
{
|
||||
m_ui->deviceName->setText(tr("BlackBerry Device"));
|
||||
m_ui->deviceHostIp->setText(QString());
|
||||
m_ui->password->setText(QString());
|
||||
m_ui->physicalDevice->setChecked(true);
|
||||
m_ui->deviceHostIp->setText(defaultDeviceHostIp(machineType()));
|
||||
}
|
||||
|
||||
bool BlackBerryDeviceConfigurationWizardSetupPage::isComplete() const
|
||||
@@ -114,6 +119,11 @@ IDevice::MachineType BlackBerryDeviceConfigurationWizardSetupPage::machineType()
|
||||
return m_ui->physicalDevice->isChecked() ? IDevice::Hardware : IDevice::Emulator;
|
||||
}
|
||||
|
||||
void BlackBerryDeviceConfigurationWizardSetupPage::handleMachineTypeChanged()
|
||||
{
|
||||
m_ui->deviceHostIp->setText(defaultDeviceHostIp(machineType()));
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user