Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)

Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
This commit is contained in:
con
2010-07-13 11:31:05 +02:00
22 changed files with 844 additions and 625 deletions

View File

@@ -92,6 +92,9 @@ QString MaemoPackageCreationWidget::displayName() const
void MaemoPackageCreationWidget::handleSkipButtonToggled(bool checked)
{
m_ui->major->setEnabled(!checked);
m_ui->minor->setEnabled(!checked);
m_ui->patch->setEnabled(!checked);
m_step->setPackagingEnabled(!checked);
}