forked from qt-creator/qt-creator
Maemo: No automatic test for new Qemu device configuration.
It is very unlikely that the emulator is already running.
This commit is contained in:
@@ -181,6 +181,7 @@ void MaemoDeviceConfigurationsSettingsWidget::addConfig()
|
||||
wizard.createDeviceConfig();
|
||||
m_ui->removeConfigButton->setEnabled(true);
|
||||
m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
|
||||
if (currentConfig()->type() != MaemoDeviceConfig::Emulator)
|
||||
testConfig();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -471,14 +471,14 @@ public:
|
||||
|
||||
virtual void initializePage()
|
||||
{
|
||||
QString infoText = tr("The new device configuration will now be "
|
||||
QString infoText;
|
||||
if (m_wizardData.deviceType == MaemoDeviceConfig::Physical) {
|
||||
infoText = tr("The new device configuration will now be "
|
||||
"created and a test procedure will be run to check whether "
|
||||
"Qt Creator can connect to the device and to provide some "
|
||||
"information about its features.");
|
||||
if (m_wizardData.deviceType == MaemoDeviceConfig::Emulator) {
|
||||
infoText += QLatin1Char('\n')
|
||||
+ tr("Please make sure that Qemu is running, otherwise "
|
||||
"the test will fail.");
|
||||
} else {
|
||||
infoText = tr("The new device configuration will now be created.");
|
||||
}
|
||||
m_infoLabel->setText(infoText);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user