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

Maemo: No automatic test for new Qemu device configuration.

Browse Source 
It is very unlikely that the emulator is already running.
This commit is contained in:
Christian Kandeler
2011-03-29 08:40:21 +02:00
parent 8839031e60
commit 325424d0d1
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
View File

@@ -181,6 +181,7 @@ void MaemoDeviceConfigurationsSettingsWidget::addConfig()
wizard.createDeviceConfig(); wizard.createDeviceConfig();
m_ui->removeConfigButton->setEnabled(true); m_ui->removeConfigButton->setEnabled(true);
m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1); m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
if (currentConfig()->type() != MaemoDeviceConfig::Emulator)
testConfig(); testConfig();
} }
} }

10
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
View File

@@ -471,14 +471,14 @@ public:
virtual void initializePage() 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 " "created and a test procedure will be run to check whether "
"Qt Creator can connect to the device and to provide some " "Qt Creator can connect to the device and to provide some "
"information about its features."); "information about its features.");
if (m_wizardData.deviceType == MaemoDeviceConfig::Emulator) { } else {
infoText += QLatin1Char('\n') infoText = tr("The new device configuration will now be created.");
+ tr("Please make sure that Qemu is running, otherwise "
"the test will fail.");
} }
m_infoLabel->setText(infoText); m_infoLabel->setText(infoText);
} }