forked from qt-creator/qt-creator
S60: Use a DetailsWidget for the run configuration widgets, add info
- 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:
@@ -102,26 +102,21 @@ struct Library
|
||||
uint dataseg;
|
||||
};
|
||||
|
||||
struct TrkAppVersion {
|
||||
TrkAppVersion();
|
||||
void reset();
|
||||
|
||||
int trkMajor;
|
||||
int trkMinor;
|
||||
int protocolMajor;
|
||||
int protocolMinor;
|
||||
};
|
||||
|
||||
struct Session
|
||||
{
|
||||
Session() { reset(); }
|
||||
|
||||
void reset() {
|
||||
cpuMajor = 0;
|
||||
cpuMinor = 0;
|
||||
bigEndian = 0;
|
||||
defaultTypeSize = 0;
|
||||
fpTypeSize = 0;
|
||||
extended1TypeSize = 0;
|
||||
extended2TypeSize = 0;
|
||||
pid = 0;
|
||||
tid = 0;
|
||||
codeseg = 0;
|
||||
dataseg = 0;
|
||||
|
||||
currentThread = 0;
|
||||
libraries.clear();
|
||||
}
|
||||
Session();
|
||||
void reset();
|
||||
QString deviceDescription(unsigned verbose) const;
|
||||
|
||||
// Trk feedback
|
||||
byte cpuMajor;
|
||||
@@ -131,6 +126,7 @@ struct Session
|
||||
byte fpTypeSize;
|
||||
byte extended1TypeSize;
|
||||
byte extended2TypeSize;
|
||||
TrkAppVersion trkAppVersion;
|
||||
uint pid;
|
||||
uint tid;
|
||||
uint codeseg;
|
||||
|
||||
Reference in New Issue
Block a user