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

Show the user the device name in application output.

Browse Source 
Reviewed-by: Daniel Molkentin
This commit is contained in:
con
2009-08-04 11:16:48 +02:00
parent 2721eb2371
commit 33bbae9e5e
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -482,6 +482,7 @@ void S60DeviceRunControl::start()
Qt4Project *project = qobject_cast<Qt4Project *>(rc->project());
m_serialPortName = rc->serialPortName();
m_serialPortFriendlyName = S60Manager::instance()->serialDeviceLister()->friendlyNameForPort(m_serialPortName);
m_targetName = rc->targetName();
m_baseFileName = rc->basePackageFilePath();
m_workingDirectory = QFileInfo(m_baseFileName).absolutePath();
@@ -589,6 +590,7 @@ void S60DeviceRunControl::signsisProcessFinished()
m_adapter->setCopyFileName(copySrc, copyDst);
m_adapter->setInstallFileName(copyDst);
m_adapter->setFileName(runFileName);
emit addToOutputWindow(this, tr("Starting application on %1...").arg(m_serialPortFriendlyName));
if (!m_adapter->startServer()) {
delete m_adapter;
m_adapter = 0;
@@ -600,7 +602,7 @@ void S60DeviceRunControl::signsisProcessFinished()
void S60DeviceRunControl::printCopyingNotice()
{
emit addToOutputWindow(this, tr("Copying install file to device..."));
emit addToOutputWindow(this, tr("Copying install file..."));
}
void S60DeviceRunControl::printInstallingNotice()
@@ -610,7 +612,7 @@ void S60DeviceRunControl::printInstallingNotice()
void S60DeviceRunControl::printStartingNotice()
{
emit addToOutputWindow(this, tr("Starting..."));
emit addToOutputWindow(this, tr("Starting application..."));
}
void S60DeviceRunControl::printRunNotice(uint pid)