delta/qt-creator.git - code.qt.io: qt-creator/qt-creator.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Ssh: Implement tcp/ip forward tunneling	Ulf Hermann	2016-05-23	1	-77/+6
\| \| \| \| \|	Change-Id: I529b3392ea7e4cbae2c736c9f55352ef6b19da98 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
*	Update License according to agreement with Free Qt Foundation	Tobias Hunger	2016-01-19	1	-17/+13
\| \| \| \| \| \| \|	* Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
*	SSH: Use categorized logging.	Christian Kandeler	2016-01-18	1	-5/+6
\| \| \| \| \| \|	Change-Id: I9890c7d4a86320c835e70e66c523c5a2f7b41421 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
*	SSH: Fix TCP/IP forwarding support.	Christian Kandeler	2015-04-15	1	-10/+14
\| \| \| \| \| \| \| \| \|	We hardcoded the remote host to the SSH server for some reason, and the originating port was bogus as well. Change-Id: I8f6700bc12f4374302dd3bfc035c9c9f060f56ef Reviewed-by: Caspar Romot <cro@icd.ee> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
*	Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'	Eike Ziller	2015-02-12	1	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
\| *	Update License	Eike Ziller	2015-01-16	1	-6/+6
\| \| \| \| \| \| \| \| \| \|	Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* \|	Catch exceptions by const reference.	Christian Kandeler	2014-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: Ic537fd123478a4f8fe4e54736d444fa64fd62d9c Reviewed-by: hjk <hjk121@nokiamail.com>
* \|	Ssh: Remove indirection in AbstractSshChannel::m_timeoutTimer	hjk	2014-11-27	1	-1/+1
\|/ \| \| \| \| \| \|	... and connect it using Qt5-style connects. Change-Id: Ic7f36949b38d4773f5ac0f04853abf93bebcf467 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
*	License update	Eike Ziller	2014-10-09	1	-7/+8
\| \| \| \| \|	Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
*	Incremented year in copyright info	Robert Loehning	2014-01-08	1	-1/+1
\| \| \| \| \| \|	Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
*	Updated license headers	Robert Loehning	2013-02-01	1	-23/+20
\| \| \| \| \|	Change-Id: I3ff71d3a686453e92ba8724e75a1879f48653d11 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
*	Incremented year in copyright info	Robert Loehning	2013-02-01	1	-1/+1
\| \| \| \| \|	Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
*	SSH: Implement tunneling.	Christian Kandeler	2012-08-28	1	-0/+194
	This is the "direct-tcpip" port forwarding specified in RFC 4254. Change-Id: I1ffa2e923b4479c7211b1b4304e66895b565fb64 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>