Merge remote branch 'origin/2.0'

This commit is contained in:
con
2010-05-05 19:06:57 +02:00
258 changed files with 46 additions and 21 deletions

View File

@@ -249,6 +249,8 @@ S60CreatePackageStepConfigWidget::S60CreatePackageStepConfigWidget(S60CreatePack
: BuildStepConfigWidget(), m_signStep(signStep)
{
m_ui.setupUi(this);
m_ui.signaturePath->setExpectedKind(Utils::PathChooser::File);
m_ui.keyFilePath->setExpectedKind(Utils::PathChooser::File);
updateUi();
connect(m_ui.customCertificateButton, SIGNAL(clicked()),
this, SLOT(updateFromUi()));