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

2
src/plugins/ios/iosbuildsettingswidget.cpp
View File

@@ -126,7 +126,7 @@ void IosBuildSettingsWidget::setDefaultSigningIdentfier(const QString &identifie
} else {
// Reset to default
ui->m_signEntityCombo->setCurrentIndex(0);
qCDebug(iosSettingsLog) << "Can not find default"
qCDebug(iosSettingsLog) << "Cannot find default"
<< (ui->m_autoSignCheckbox->isChecked() ? "team": "provisioning profile")
<< ". Identifier: " << identifier;
}

6
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -107,7 +107,7 @@ static bool launchSimulator(const QString &simUdid) {
return runSimCtlCommand(QStringList({"boot", simUdid}), nullptr);
}
} else {
qCDebug(simulatorLog) << "Can not start Simulator device."
qCDebug(simulatorLog) << "Cannot start Simulator device."
<< "Error probing Simulator.app instance";
return false;
}
@@ -438,7 +438,7 @@ void SimulatorControlPrivate::startSimulator(QFutureInterface<SimulatorControl::
}
if (simInfo.isShuttingDown()) {
qCDebug(simulatorLog) << "Can not start Simulator device. "
qCDebug(simulatorLog) << "Cannot start Simulator device. "
<< "Previous instance taking too long to shutdown." << simInfo;
return;
}
@@ -465,7 +465,7 @@ void SimulatorControlPrivate::startSimulator(QFutureInterface<SimulatorControl::
qCDebug(simulatorLog) << "Error starting simulator.";
}
} else {
qCDebug(simulatorLog) << "Can not start Simulator device. Simulator not in shutdown state."
qCDebug(simulatorLog) << "Cannot start Simulator device. Simulator not in shutdown state."
<< simInfo;
}