Eike Ziller
e5ca4b3462
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
2011-07-15 14:29:07 +02:00
Christian Kandeler
404b797779
MeeGo: Fix process killing for long application names.
...
QTCREATORBUG-5141
Change-Id: I92017c1892ccc76a396c10d9aee49ece10df4574
Reviewed-on: http://codereview.qt.nokia.com/1414
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-07-11 12:56:56 +02:00
Oswald Buddenhagen
1f3896e8af
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
share/qtcreator/dumper/bridge.py
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
2011-07-07 12:26:59 +02:00
Christian Kandeler
ee635dcf9e
SSH: Don't allow connectToHost() while already connecting/connected.
...
Also fix callers potentially violating this policy.
Change-Id: I630f1c544885df93a81e217e792363c0c2314108
Reviewed-on: http://codereview.qt.nokia.com/1186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2011-07-06 13:09:05 +02:00
Christian Kandeler
5722a11005
RemoteLinux: Add additional hook for application runner.
...
Could be used e.g. for on-demand emulator start-up.
Change-Id: Ic62c6f1ac7f9151b1f26b749405d97a2f727d15d
Reviewed-on: http://codereview.qt.nokia.com/882
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-06-29 11:39:29 +02:00
Christian Kandeler
9197596000
RemoteLinux: Put PortList class into its own set of files.
...
This also enables us to replace some includes by forward declarations.
Change-Id: Ica98c1925e49c65d15b9e47abe1c4aeba0790482
Reviewed-on: http://codereview.qt.nokia.com/583
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2011-06-22 10:34:39 +02:00
Christian Kandeler
f74e167563
RemoteLinux: More untangling of generic and Maemo-specific stuff.
...
- Make key deployment a device type dependent action.
- Split up monolithic device configuration wizard.
- Split up run configurations, run controls and the associated
factories.
Change-Id: Ib2ef9d405e6b7eaae89fc27c56e3c327829a88f7
Reviewed-on: http://codereview.qt.nokia.com/486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-06-20 17:50:29 +02:00
