← Back to branch summary

~ubuntu-sdk-team/qtcreator-plugin-remotelinux/trunk

« back to all changes in this revision

Viewing changes to src/qnx/blackberrydebugtokenrequestdialog.cpp

  • Committer: CI bot
  • Author(s): Benjamin Zeller
  • Date: 2014-06-16 10:28:43 UTC
  • mfrom: (4.2.4 remotelinux)
  • Revision ID: ps-jenkins@lists.canonical.com-20140616102843-8juvmjvzwlzsboyw
Migrating to Qt5.3 and QtC 3.1 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qnx/blackberrydebugtokenrequestdialog.cpp
55
55
    m_ui->progressBar->hide();
56
56
    m_ui->status->clear();
57
57
    m_ui->debugTokenPath->setExpectedKind(Utils::PathChooser::SaveFile);
 
58
    m_ui->debugTokenPath->setHistoryCompleter(QLatin1String("BB.DebugToken.History"));
58
59
    m_ui->debugTokenPath->setPromptDialogTitle(tr("Request Debug Token"));
59
60
    m_ui->debugTokenPath->setPromptDialogFilter(tr("BAR Files (*.bar)"));
60
61
 
141
142
        }
142
143
    }
143
144
 
144
 
    BlackBerryConfigurationManager &configuration = BlackBerryConfigurationManager::instance();
 
145
    bool ok;
 
146
    const QString cskPassword = m_utils.cskPassword(this, &ok);
 
147
 
 
148
    if (!ok) {
 
149
        setBusy(false);
 
150
        return;
 
151
    }
 
152
 
 
153
    const QString certificatePassword = m_utils.certificatePassword(this, &ok);
 
154
 
 
155
    if (!ok) {
 
156
        setBusy(false);
 
157
        return;
 
158
    }
145
159
 
146
160
    m_requester->requestDebugToken(m_ui->debugTokenPath->path(),
147
 
            m_utils.cskPassword(), configuration.defaultKeystorePath(),
148
 
            m_utils.certificatePassword(), m_ui->devicePin->text());
 
161
            cskPassword, BlackBerryConfigurationManager::instance()->defaultKeystorePath(),
 
162
            certificatePassword, m_ui->devicePin->text());
149
163
}
150
164
 
151
165
void BlackBerryDebugTokenRequestDialog::setDefaultPath()
235
249
        break;
236
250
    }
237
251
 
 
252
    QFile file(m_ui->debugTokenPath->path());
 
253
 
 
254
    if (file.exists())
 
255
        file.remove();
 
256
 
238
257
    QMessageBox::critical(this, tr("Error"), errorString);
239
258
 
240
259
    setBusy(false);