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

Qnx: Create slog2 runner processes at more reasonable times

Browse Source 
89f02cba2c introduced a regression.

Change-Id: I3ae4ecc7f2dfcd477ffe7a277a87acd90aad5339
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-08-10 17:00:03 +02:00
parent 90d152ac07
commit 4048629d1a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qnx/slog2inforunner.cpp
View File

@@ -46,11 +46,7 @@ Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl)
auto qnxRunConfig = qobject_cast<QnxRunConfiguration *>(runControl->runConfiguration()); auto qnxRunConfig = qobject_cast<QnxRunConfiguration *>(runControl->runConfiguration());
QTC_ASSERT(qnxRunConfig, return); QTC_ASSERT(qnxRunConfig, return);
m_applicationId = FileName::fromString(qnxRunConfig->remoteExecutableFilePath()).fileName(); m_applicationId = FileName::fromString(qnxRunConfig->remoteExecutableFilePath()).fileName();
}
void Slog2InfoRunner::printMissingWarning()
{
appendMessage(tr("Warning: \"slog2info\" is not found on the device, debug output not available."), ErrorMessageFormat);
// See QTCREATORBUG-10712 for details. // See QTCREATORBUG-10712 for details.
// We need to limit length of ApplicationId to 63 otherwise it would not match one in slog2info. // We need to limit length of ApplicationId to 63 otherwise it would not match one in slog2info.
m_applicationId.truncate(63); m_applicationId.truncate(63);
@@ -69,6 +65,11 @@ void Slog2InfoRunner::printMissingWarning()
connect(m_logProcess, &DeviceProcess::finished, this, &Slog2InfoRunner::finished); connect(m_logProcess, &DeviceProcess::finished, this, &Slog2InfoRunner::finished);
} }
void Slog2InfoRunner::printMissingWarning()
{
appendMessage(tr("Warning: \"slog2info\" is not found on the device, debug output not available."), ErrorMessageFormat);
}
void Slog2InfoRunner::start() void Slog2InfoRunner::start()
{ {
StandardRunnable r; StandardRunnable r;