feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,295 Commits 108 Branches 368 Tags
a92e38f47f7c54a0844e98e47d3a0f830b1c4c93
Commit Graph

17 Commits

Author SHA1 Message Date
Christian Kandeler
232724cc11 SSH: Make API of SshRemoteProcess more similar to the one of QProcess. 
In the end, we want to derive it from QIODevice as well.

Change-Id: I30e7cb23ec8e5753c363d1f4457b650556860ac2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:42:27 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kandeler
68f86a9479 RemoteLinux: Don't rely on the presence of pkill. 
Change-Id: Iad42c1c356d9c3914e46082decc0a38d844ed98d
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 17:40:41 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kandeler
8801c76a8e Coding style: Pure virtual functions, private implementation pointers. 
Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 10:33:56 +02:00
Christian Kandeler
5288267be0 RemoteLinux: It's not a fatal error when ports gathering fails. 
Change-Id: If803e1acaaa8164a5177fa5ca227516cc06c577c
Reviewed-on: http://codereview.qt.nokia.com/4364
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 15:44:24 +02:00
Christian Kandeler
7b90c8b0c5 RemoteLinux: Let application runners set the device configuration. 
Could conceivably make sense during doDeviceSetup().

Change-Id: I6a30d44561dbe75566e48c6db9604ff72075b8dd
Reviewed-on: http://codereview.qt.nokia.com/3114
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-08-17 17:34:44 +02:00
Christian Kandeler
edc776c26c RemoteLinux: Private implementation for all exported classes. 
Change-Id: Id92eb156b027a4986788141845170105b3b1d9e5
Reviewed-on: http://codereview.qt.nokia.com/2507
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-08-02 13:38:55 +02:00
Christian Kandeler
bbbda740c3 RemoteLinux: Rename and export MaemoUsedPortsGatherer. 
Class is not Maemo-specific.

Change-Id: I14473cb329e4955d24dae1a1a4961eb6ebff869c
Reviewed-on: http://codereview.qt.nokia.com/2042
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 16:11:15 +02:00
Christian Kandeler
410d5bd0cf RemoteLinux: Refactor application runner. 
This removes the remaining Maemo dependencies from the generic case.

Change-Id: If4f3e6c3b3768769af4f753c2d667df271de7ed4
Reviewed-on: http://codereview.qt.nokia.com/1823
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-19 14:57:29 +02:00
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