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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	doc/src/editors/creator-only/creator-code-pasting.qdoc
	src/plugins/android/androidbuildapkwidget.cpp

Change-Id: Iea8b7135643d14ffe49d10b14bedb8fa5ac48063
This commit is contained in:
Eike Ziller
2018-10-24 13:58:45 +02:00
parent bc5e640a46 d1430c9542
commit fd7cba88ef
81 changed files with 316 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
m_step(step)
{
m_ui->setupUi(this);
setDisplayName(tr("<b>Build Android APK</b>"));
setDisplayName("<b>" + tr("Build Android APK" + "</b>"));
setSummaryText(displayName());
// Target sdk combobox
@@ -225,8 +225,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
BuildStepConfigWidget(step),
m_step(step)
{
setDisplayName(tr("<b>Build Android APK</b>"));
setSummaryText(tr("<b>Build Android APK</b>"));
setDisplayName("<b>" + tr("Build Android APK" + "</b>"));
setSummaryText("<b>" + tr("Build Android APK" + "</b>"));
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);

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

@@ -793,7 +793,7 @@ QVersionNumber AndroidConfig::ndkVersion() const
{
QVersionNumber version;
if (!m_ndkLocation.exists()) {
qCDebug(avdConfigLog) << "Can not find ndk version. Check NDK path."
qCDebug(avdConfigLog) << "Cannot find ndk version. Check NDK path."
<< m_ndkLocation.toString();
return version;
}
@@ -826,11 +826,11 @@ QVersionNumber AndroidConfig::ndkVersion() const
version = QVersionNumber::fromString(QString("%1.%2.0").arg(major)
.arg((int)minor[0].toLatin1() - 97));
} else {
qCDebug(avdConfigLog) << "Can not find ndk version. Can not parse RELEASE.TXT."
qCDebug(avdConfigLog) << "Cannot find ndk version. Cannot parse RELEASE.TXT."
<< content;
}
} else {
qCDebug(avdConfigLog) << "Can not find ndk version." << errorString;
qCDebug(avdConfigLog) << "Cannot find ndk version." << errorString;
}
}
return version;

2
src/plugins/android/androidmanager.cpp
View File

@@ -220,7 +220,7 @@ QString AndroidManager::activityName(ProjectExplorer::Target *target)
/*!
Returns the minimum Android API level set for the APK. Minimum API level
of the kit is returned if the manifest file of the APK can not be found
of the kit is returned if the manifest file of the APK cannot be found
or parsed.
*/
int AndroidManager::minimumSDK(ProjectExplorer::Target *target)

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -400,7 +400,7 @@ void AndroidRunnerWorker::asyncStartHelper()
runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir.trimmed()});
if (m_gdbserverPath.isEmpty() || !uploadFile(m_gdbserverPath, "gdbserver")) {
emit remoteProcessFinished(tr("Can not find/copy C++ debug server."));
emit remoteProcessFinished(tr("Cannot find/copy C++ debug server."));
return;
}

4
src/plugins/android/androidsdkmanager.cpp
View File

@@ -627,7 +627,7 @@ AndroidSdkPackage *SdkManagerOutputParser::parsePlatform(const QStringList &data
if (parseAbstractData(packageData, data, 2, "Platform")) {
int apiLevel = platformNameToApiLevel(packageData.headerParts.at(1));
if (apiLevel == -1) {
qCDebug(sdkManagerLog) << "Platform: Can not parse api level:"<< data;
qCDebug(sdkManagerLog) << "Platform: Cannot parse api level:"<< data;
return nullptr;
}
platform = new SdkPlatform(packageData.revision, data.at(0), apiLevel);
@@ -647,7 +647,7 @@ QPair<SystemImage *, int> SdkManagerOutputParser::parseSystemImage(const QString
if (parseAbstractData(packageData, data, 4, "System-image")) {
int apiLevel = platformNameToApiLevel(packageData.headerParts.at(1));
if (apiLevel == -1) {
qCDebug(sdkManagerLog) << "System-image: Can not parse api level:"<< data;
qCDebug(sdkManagerLog) << "System-image: Cannot parse api level:"<< data;
return result;
}
auto image = new SystemImage(packageData.revision, data.at(0),

4
src/plugins/android/androidsignaloperation.cpp
View File

@@ -57,7 +57,7 @@ void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCod
m_errorMessage += QLatin1String(" adb process error: ") + adbError;
}
if (runAs.isEmpty() || !m_errorMessage.isEmpty()) {
m_errorMessage = QLatin1String("Can not find User for process: ")
m_errorMessage = QLatin1String("Cannot find User for process: ")
+ QString::number(m_pid)
+ m_errorMessage;
m_state = Idle;
@@ -90,7 +90,7 @@ void Android::Internal::AndroidSignalOperation::adbKillFinished(int exitCode,
m_errorMessage = QString::fromLatin1(m_adbProcess->readAllStandardError());
}
if (!m_errorMessage.isEmpty()) {
m_errorMessage = QLatin1String("Can not kill process: ") + QString::number(m_pid)
m_errorMessage = QLatin1String("Cannot kill process: ") + QString::number(m_pid)
+ m_errorMessage;
}
m_state = Idle;