From 24314562165588b56a318b3b8a846bf5deda7c41 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 24 Apr 2012 15:49:09 +0200 Subject: Profile introduction Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske --- src/plugins/android/androidcreatekeystorecertificate.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/android/androidcreatekeystorecertificate.cpp') diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp index 8a326c3b59..a542f7f4d0 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.cpp +++ b/src/plugins/android/androidcreatekeystorecertificate.cpp @@ -56,7 +56,7 @@ AndroidCreateKeystoreCertificate::~AndroidCreateKeystoreCertificate() delete ui; } -QString AndroidCreateKeystoreCertificate::keystoreFilePath() +Utils::FileName AndroidCreateKeystoreCertificate::keystoreFilePath() { return m_keystoreFilePath; } @@ -155,10 +155,10 @@ void AndroidCreateKeystoreCertificate::on_buttonBox_accepted() if (!ui->countryLineEdit->text().length()) ui->countryLineEdit->setFocus(); - m_keystoreFilePath = QFileDialog::getSaveFileName(this, tr("Keystore file name"), - QDir::homePath() + QLatin1String("/android_release.keystore"), - tr("Keystore files (*.keystore *.jks)")); - if (!m_keystoreFilePath.length()) + m_keystoreFilePath = Utils::FileName::fromString(QFileDialog::getSaveFileName(this, tr("Keystore file name"), + QDir::homePath() + QLatin1String("/android_release.keystore"), + tr("Keystore files (*.keystore *.jks)"))); + if (m_keystoreFilePath.isEmpty()) return; QString distinguishedNames(QString::fromLatin1("CN=%1, O=%2, L=%3, C=%4") .arg(ui->commonNameLineEdit->text().replace(QLatin1Char(','), QLatin1String("\\,"))) @@ -174,7 +174,7 @@ void AndroidCreateKeystoreCertificate::on_buttonBox_accepted() QStringList params; params << QLatin1String("-genkey") << QLatin1String("-keyalg") << QLatin1String("RSA") - << QLatin1String("-keystore") << m_keystoreFilePath + << QLatin1String("-keystore") << m_keystoreFilePath.toString() << QLatin1String("-storepass") << ui->keystorePassLineEdit->text() << QLatin1String("-alias") << ui->aliasNameLineEdit->text() << QLatin1String("-keysize") << ui->keySizeSpinBox->text() @@ -183,7 +183,7 @@ void AndroidCreateKeystoreCertificate::on_buttonBox_accepted() << QLatin1String("-dname") << distinguishedNames; QProcess genKeyCertProc; - genKeyCertProc.start(AndroidConfigurations::instance().keytoolPath(), params ); + genKeyCertProc.start(AndroidConfigurations::instance().keytoolPath().toString(), params ); if (!genKeyCertProc.waitForStarted() || !genKeyCertProc.waitForFinished()) return; -- cgit v1.2.1