Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						ef8787e59f 
					 
					
						
						
							
							Fix tests compilation  
						
						... 
						
						
						
						Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com > 
						
						
					 
					
						2013-03-05 09:01:18 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						1fda2111d4 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.6'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104 
						
						
					 
					
						2013-01-31 16:25:33 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						298531e370 
					 
					
						
						
							
							Incremented year in copyright info  
						
						... 
						
						
						
						Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2013-01-29 16:27:03 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						707f1b4419 
					 
					
						
						
							
							SSH: Adapt tests to API change.  
						
						... 
						
						
						
						Change-Id: I0b104942d97238aff8ac21e0e047a17079a53181
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com > 
						
						
					 
					
						2012-12-11 13:55:44 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						386ca7c8dd 
					 
					
						
						
							
							Adjust license headers  
						
						... 
						
						
						
						Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2012-10-05 17:12:56 +02:00 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						e0e8cf3ada 
					 
					
						
						
							
							Contact -> qt-project.org  
						
						... 
						
						
						
						Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2012-07-19 13:23:21 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						53a1087d13 
					 
					
						
						
							
							Move SSH support into a dedicated library.  
						
						... 
						
						
						
						It does not belong into libUtils, which is a collection of small
unrelated utility classes.
Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2012-05-22 10:51:53 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						2931a499e6 
					 
					
						
						
							
							Long live the king!  
						
						... 
						
						
						
						Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com > 
						
						
					 
					
						2012-01-26 19:55:36 +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 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						a322bd606f 
					 
					
						
						
							
							Replace qt-info@nokia.com with info@qt.nokia.com  
						
						... 
						
						
						
						Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2011-07-06 11:14:01 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						8397663964 
					 
					
						
						
							
							Update license.  
						
						
						
						
					 
					
						2011-04-13 11:49:28 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						afa13623cd 
					 
					
						
						
							
							SSH: Fix tests to adapt to new location (utils vs. core plugin).  
						
						
						
						
					 
					
						2011-04-01 09:58:29 +02:00 
						 
				 
			
				
					
						
							
							
								Bill King 
							
						 
					 
					
						
						
							
						
						3593fe08ae 
					 
					
						
						
							
							tests: add licence headers  
						
						
						
						
					 
					
						2011-02-18 14:48:16 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						4578e32fe5 
					 
					
						
						
							
							Tests: Start implementing more thorough SSH test.  
						
						
						
						
					 
					
						2010-10-04 17:54:46 +02:00