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

S60: Use a DetailsWidget for the run configuration widgets, add info

Browse Source 
- Move the s60devicerunconfigurationwidget into a separate file,
  add an info button that connects to the device and displays
  CPU/Trk version for testing the connection.
- give TrkLauncher a parent object and an acessor for the device
  description in formatted form.
- Break deadlock when trying to terminate the Windows Trk writer
  thread with bytes pending by using a wait with timeout and
  termination flag.
This commit is contained in:
Friedemann Kleint
2009-10-21 16:48:46 +02:00
parent 338f945ca1
commit 20edb02093
12 changed files with 600 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/shared/trk/launcher.cpp
View File

@@ -73,7 +73,8 @@ LauncherPrivate::LauncherPrivate() :
{
}
Launcher::Launcher(Actions startupActions) :
Launcher::Launcher(Actions startupActions, QObject *parent) :
QObject(parent),
d(new LauncherPrivate)
{
d->m_startupActions = startupActions;
@@ -318,6 +319,11 @@ void Launcher::handleResult(const TrkResult &result)
}
}
QString Launcher::deviceDescription(unsigned verbose) const
{
return d->m_session.deviceDescription(verbose);
}
void Launcher::handleTrkVersion(const TrkResult &result)
{
if (result.errorCode() || result.data.size() < 5) {
@@ -325,19 +331,13 @@ void Launcher::handleTrkVersion(const TrkResult &result)
emit finished();
return;
}
const int trkMajor = result.data.at(1);
const int trkMinor = result.data.at(2);
const int protocolMajor = result.data.at(3);
const int protocolMinor = result.data.at(4);
d->m_session.trkAppVersion.trkMajor = result.data.at(1);
d->m_session.trkAppVersion.trkMinor = result.data.at(2);
d->m_session.trkAppVersion.protocolMajor = result.data.at(3);
d->m_session.trkAppVersion.protocolMinor = result.data.at(4);
// Ping mode: Log & Terminate
if (d->m_startupActions == ActionPingOnly) {
QString msg;
QTextStream(&msg) << "CPU: " << d->m_session.cpuMajor << '.' << d->m_session.cpuMinor << ' '
<< (d->m_session.bigEndian ? "big endian" : "little endian")
<< " type size: " << d->m_session.defaultTypeSize
<< " float size: " << d->m_session.fpTypeSize
<< " Trk: v" << trkMajor << '.' << trkMinor << " Protocol: " << protocolMajor << '.' << protocolMinor;
qWarning("%s", qPrintable(msg));
qWarning("%s", qPrintable(deviceDescription()));
emit finished();
}
}