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

Further string fixes

Browse Source 
Change-Id: Iab93aea9e7ec17dd8196a957f90beb1ee3179605
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-01-07 11:55:43 +01:00
parent 0eeb590fdf
commit 89ca18e4d7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -1,7 +1,7 @@
/************************************************************************** /**************************************************************************
** **
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com> ** Copyright (c) 2015 BogDan Vatra <bog_dan_ro@yahoo.com>
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal ** Contact: http://www.qt-project.org/legal
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.
@@ -395,7 +395,7 @@ bool AndroidDeployQtStep::processSucceeded(int exitCode, QProcess::ExitStatus st
if (!m_installOk && !m_uninstallPreviousPackageRun && if (!m_installOk && !m_uninstallPreviousPackageRun &&
QMessageBox::critical(0, tr("Install failed"), QMessageBox::critical(0, tr("Install failed"),
tr("Another application with the same package id but signed with " tr("Another application with the same package id but signed with "
"different ceritificate already exists.\n" "different certificate already exists.\n"
"Do you want to uninstall the existing package next time?"), "Do you want to uninstall the existing package next time?"),
QMessageBox::Yes, QMessageBox::No) QMessageBox::Yes, QMessageBox::No)
== QMessageBox::Yes) { == QMessageBox::Yes) {

6
src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal ** Contact: http://www.qt-project.org/legal
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.
@@ -690,13 +690,13 @@ bool JsonFieldPage::ComboBoxField::parseData(const QVariant &data, QString *erro
m_index = tmp.value(QLatin1String("index"), 0).toInt(&ok); m_index = tmp.value(QLatin1String("index"), 0).toInt(&ok);
if (!ok) { if (!ok) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage", *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
"ComboBox 'index' is not a integer value."); "ComboBox 'index' is not an integer value.");
return false; return false;
} }
m_disabledIndex = tmp.value(QLatin1String("disabledIndex"), -1).toInt(&ok); m_disabledIndex = tmp.value(QLatin1String("disabledIndex"), -1).toInt(&ok);
if (!ok) { if (!ok) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage", *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
"ComboBox 'disabledIndex' is not a integer value."); "ComboBox 'disabledIndex' is not an integer value.");
return false; return false;
} }