| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch accepted upstream has the signal and slot renamed, so there
is a corresponding change to main.cpp
commit 53c672fb9853fef5a00285213084f02a4253e5f3
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 15:45:40 2010 +0100
trk: Handle TrkNotifyStopped in launcher.
Add signal and static utility functions to parse message.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch accepted upstream changed a parameter from QString to
QStringList. So there is a corresponding change to main.cpp to use the
new API.
commit b1291ecfd0ab31c41783feb645c98ce42fa87aae
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 12:33:34 2010 +0100
trk: Add support for command line arguments in trk::Launcher.
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
| |
|
|
| |
Reviewed-by: axis
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 1b77161e7183cdd4b5493698b4cddc727468f0f5
Author: hjk <qtc-committer@nokia.com>
Date: Fri Jan 15 12:01:26 2010 +0100
debugger: clean up verbosity settings in trk adapter
commit 4d7341becac684f5feb908e45d8b1756b4823c20
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:48:29 2010 +0100
debugger: whitespace
commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:46:13 2010 +0100
debugger: add some debug output to trk device
commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d
Author: hjk <qtc-committer@nokia.com>
Date: Mon Jan 4 13:17:38 2010 +0100
debugger: add list of thread ids to TRK session state object
Reviewed-by: Shane Kearns
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enumerate the ACM ports which are created in /dev after plugging in the
phone.
Tested on Kubuntu (karmic koala), using 5800XM and N95.
Linux has two USB drivers of interest.
1: CDC-ACM, this loads automatically, and creates /dev/ttyACM<n> for
the USB modem interface
2: USBSERIAL, this needs to be loaded manually using modprobe, and
creates /dev/ttyUSB<n> for each ACM interface on the phone
The second ttyUSB port is the one we need, this enumerator does not
pick the correct port yet. (1st port is ECACM:0, i.e. the modem, 2nd
port is ECACM:1, i.e. the general purpose port used by TRK)
according to lsusb, the 1st ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 1 (AT commands)
2nd ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 255 (vendor specific)
Linux 2.6.33 RC3 has a hardcoded list of nokia phones in cdc-acm.c for which
the protocol 255 ACM port will be recognised as a second ttyACM
Task-number: QTBUG-7446
Reviewed-by: Miikka Heikkinen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Removed the alternate implementation of the registry reading, although
the new API is simpler, the old XP method is not deprecated.
Added an extra library that is needed according to API documentation,
but is omittable on MinGW.
Also gave a better error message when serial port detection fails.
Reviewed-by: Miikka Heikkinen
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
|
| |
|
|
|
| |
AutoTest: Passed
RevBy: Paul Olav Tvete
|
|
|
The tool uses TRK to launch the application.
TRK is a debug agent, available as a signed package for consumer phones.
For Nokia phones, it is distributed with carbide; for other manufacturers
it can be downloaded from their developer websites.
The launcher code is reused from Qt creator, with a patch to allow us
to pass command line arguments to the process being launched.
The "make run" target is enhanced to support running on target as well as
the emulator. Like the "make sis" target, the last platform to have been
built is the one that will be launched.
The runonphone tool needs to be built in a Qt environment configured for
windows, and requires at least windows XP (Symbian development requires
windows XP SP2). Current proposal is to include a statically linked exe
in the bin directory for binary packages.
Reviewed-by: Janne Koskinen
|
