Commit Graph

99 Commits

Author SHA1 Message Date
con
686b21195d Symbian is the term. Also unconditionally reset target names.
Since the target names are translated, we cannot use the saved
display name from the user file.

Reviewed-by: Tobias Hunger
2010-02-10 12:41:07 +01:00
con
d8def18362 Give targets a tool tip property.
Use that for showing details about connected Symbian devices.
Also update the icon with an (not-)connected overlay icon.
Graphics design pending.
2010-02-09 19:07:26 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
Friedemann Kleint
3efdb87682 S60/Trk: Make the port a property of TrkDevice.
Associate the port with the device instead of passing it to open
for better handling.
2010-02-08 14:10:51 +01:00
Friedemann Kleint
76872c6ed8 S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp 2010-02-05 17:34:02 +01:00
Friedemann Kleint
a8ce2ce037 S60: Rework SerialDeviceListener.
Change it into a singleton that listens for device changes
and emits signals when devices are added or removed.
2010-02-05 17:21:29 +01:00
Tobias Hunger
520bb3662d Fix S60DeviceRunConfiguration Id 2010-02-04 12:11:12 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +01:00
Tobias Hunger
788b294a30 Make project use toMap/fromMap to save state
* That is what everybody else is using now.

Reviewed-by: dt
2010-02-01 12:23:14 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Friedemann Kleint
713be02ab7 S60: Handle TrkNotifyStopped (crash) when running.
Extract error message string from Trk, print proper message
when application crashes in run mode and terminate launcher.
Use same message in Debugger for consistency.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>Reviewed-by: John Doe

Conflicts:

	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
2010-01-21 15:51:33 +01:00
Friedemann Kleint
c516f350b2 S60: Handle TrkNotifyStopped (crash) when running.
Extract error message string from Trk, print proper message
when application crashes in run mode and terminate launcher.
Use same message in Debugger for consistency.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>Reviewed-by: John Doe
2010-01-21 15:46:33 +01:00
Friedemann Kleint
7d24517097 Revert "S60: Handle TrkNotifyStopped (crash) when running."
This reverts commit 607e545218.
2010-01-21 15:43:47 +01:00
Friedemann Kleint
607e545218 S60: Handle TrkNotifyStopped (crash) when running.
Extract error message string from Trk, print proper message
when application crashes in run mode and terminate launcher.
Use same message in Debugger for consistency.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2010-01-21 15:27:05 +01:00
Friedemann Kleint
1044af5f82 S60: Support command line arguments when running on devices.
Add command line arguments to trklauncher. Add input field
to S60DeviceRunConfiguration and pass on to RunControl and debugger.
2010-01-21 12:36:39 +01:00
dt
661314742e Simplfy code for finding the right target/executable
Reviewed-By: con
2010-01-11 15:35:14 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
con
1c1394c1eb Unify the common part for extracting the Qt project target info.
This code was (more or less) duplicated in 4 places.
2009-12-22 15:58:55 +01:00
Oswald Buddenhagen
ef660880ad make ProFileOption persist during the scan of an entire project
there is no point in throwing away and re-recreating invariant data over
and over ...

shaves off ~15% of the load time of Qt 4.6.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
3657acac5f move various functions from Qt4PriFileNode to Qt4ProFileNode
findProFileFor(), buildDir() and createProFileReader() make sense only
in relation with an actual pro file anyway, so move them there.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
9ba6f06af7 don't call setQtVersion() - createProFileReader() already does it 2009-12-08 17:36:40 +01:00
dt
1e46cb424e Rework connections on the project pane for Qt4Projects.
Should fix a lot of corner cases, might introduce a few bugs.
Also rename functions/slots to be better named.

Generic Project Manager and CMake Project Manager are missing from this
patch.
2009-12-07 15:00:17 +01:00
con
f3bdeb8c9a Share the code for determining used qmake arguments.
Move the code that compares the Qt version's debug|release property
with the build configuration's debug|release property
to the new build configuration class.

Reviewed-by: dt
2009-12-02 18:16:34 +01:00
con
e6edf54a9c Show Symbian deploy progress as real progress indicator.
Task-number: QTCREATORBUG-364
2009-11-30 17:56:06 +01:00
dt
801e9948f5 Hide static cast in accessor methods 2009-11-30 15:24:32 +01:00
dt
a312206306 Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
2009-11-30 15:24:31 +01:00
dt
fa0be746a9 Make Maemo compile again.
Conflicts:

	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
2009-11-19 16:35:19 +01:00
dt
0fa60aa3d8 Use QFlags<> for QmakeBuildConfig that removes a few casts. 2009-11-19 16:35:19 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
Friedemann Kleint
e35a754dc9 S60: Work towards new toolchains
Factor out the initialization setting up the environment and headers in
the RVCT/GCCE toolchains.
Modify the RunControl to be able to support different package
building/signing processes.
2009-11-13 15:47:35 +01:00
con
6039c31133 Show a dialog in case of mismatching build/run configurations. 2009-10-29 16:02:22 +01:00
Robert Loehning
64e2519915 TRK: Changed strings.
Using "TRK" when referring to the protocol, "App TRK" when referring to the program on the device.

Reviewed-by: Oswald Buddenhagen
2009-10-29 14:18:49 +01:00
Friedemann Kleint
d749c1dc71 S60: Provide a message box prompting to start TRK
... with cancel, similar to the Bluetooth connect box.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2009-10-29 12:48:12 +01:00
Friedemann Kleint
4091efb47f S60: Provide a MessageBox for starting serial communication as well.
Generalize the concept of the Bluetooth starter, extract base class
BaseCommunicationStarter that can be used to start a serial communication
without further resources (listener) as well. Introduce convenience
functions for both types.

Note: This will only work for COM-ports that are not used otherwise
by the operating system.
2009-10-26 15:40:11 +01:00
Robert Loehning
05f29012d9 S60: Deleting allocated TrkLauncher in dtor of S60DeviceRunControlBase. 2009-10-23 18:40:46 +02:00
Friedemann Kleint
1af61fefa8 S60: Add startup logic for Bluetooth to the project/run configuration
Prepare trk::Launcher to deal with a shared trkdevice.
Add encapsulation for the rfcomm listener process and helper
classes for prompting the user to connect the Bluetooth
device. Add a command line prompt to the trklauncher test.
2009-10-23 18:00:20 +02:00
Friedemann Kleint
8175e4e4c6 S60: Introduce a communications device type.
- Introduce a communications device type flag, add stubs for
  Bluetooth to serialdevicelister and pass the device type
  in new struct CommunicationDevice along to run configuration
  and debugger start parameters (overriding the debugger settings).
- Give the s60devices::Device a tooltip in the settings page
2009-10-22 16:42:25 +02:00
Friedemann Kleint
20edb02093 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.
2009-10-21 16:48:46 +02:00
Robert Loehning
8c4c5f2ebf Reporting failed Trk-connect. 2009-10-20 18:31:30 +02:00
Robert Loehning
6a6f944490 S60 -> Symbian for visible strings 2009-10-09 18:42:38 +02:00
Robert Loehning
0a9a1e98d9 S60 -> Symbian for visible strings, fixed missing one
Reviewed-by: Daniel Molkentin
2009-10-09 16:28:29 +02:00
Daniel Molkentin
5a0566249b S60 -> Symbian for visible strings
Reviewed-By: con
2009-10-09 15:00:23 +02:00
Friedemann Kleint
22ab8d5662 Debugger: Do configuration error checking early on.
Add a configuration checking method to the Debugger manager,
depending on toolchain, wire it to the engines.
Check that in the debugger run controls.

Add a convenience method to ICore that shows a warning
message with a "Settings" button, pointing the user
to a configuration error on a settings page.

Remove leftovers of the dumper parser.
Acked-by: con <qtc-committer@nokia.com>
2009-10-08 17:23:27 +02:00
con
b4a17a03c0 Naming of run configurations. 2009-10-08 15:51:13 +02:00
con
eb32fab806 Adapt to new packaging system in Qt for Symbian. 2009-10-07 17:22:46 +02:00
Friedemann Kleint
772a9a943a Trk/S60: Determine symbol file correctly. 2009-10-06 17:12:52 +02:00
Robert Loehning
44f224ac53 Trk: Checking result of TrkCloseFile 2009-10-06 12:29:43 +02:00