Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						513209cf1f 
					 
					
						
						
							
							QmlDesigner: Add logging to NodeInstanceView  
						
						... 
						
						
						
						Change-Id: I95f9f2e089f2d66ba9cf27b631d2478d54b18085
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io > 
						
						
					 
					
						2017-03-01 16:20:48 +00:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						39a38d5679 
					 
					
						
						
							
							Wholesale conversion to #pragma once  
						
						... 
						
						
						
						Kudos to cgmb and https://github.com/cgmb/guardonce 
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2016-03-30 15:20:19 +00:00 
						 
				 
			
				
					
						
							
							
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						38cce7eb83 
					 
					
						
						
							
							Update License according to agreement with Free Qt Foundation  
						
						... 
						
						
						
						* Update all files in share folder
Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com > 
						
						
					 
					
						2016-01-19 16:05:29 +00:00 
						 
				 
			
				
					
						
							
							
								Alessandro Portale 
							
						 
					 
					
						
						
							
						
						374f84acc7 
					 
					
						
						
							
							Qt Quick Designer: License change to Qt Commercial + GPLv3  
						
						... 
						
						
						
						Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com >
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com >
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com > 
						
						
					 
					
						2015-09-18 12:12:57 +00:00 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						3c85058694 
					 
					
						
						
							
							Update License  
						
						... 
						
						
						
						Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2015-01-16 12:37:56 +01:00 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						8295b503be 
					 
					
						
						
							
							License update  
						
						... 
						
						
						
						Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2014-10-09 11:41:44 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						746c5d8863 
					 
					
						
						
							
							Incremented year in copyright info  
						
						... 
						
						
						
						Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2014-01-08 08:29:47 +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 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						6fd252b0a5 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.6'  
						
						... 
						
						
						
						Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580 
						
						
					 
					
						2012-10-05 21:20:50 +02: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 
						 
				 
			
				
					
						
							
							
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						ce9b7bf123 
					 
					
						
						
							
							QmlDesigner.NodeInstances: Shared memory for value changes  
						
						... 
						
						
						
						Change-Id: I3c3455f411f18322a062f144e98461691d12ada8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com > 
						
						
					 
					
						2012-09-11 15:41:41 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						765ba3b4b9 
					 
					
						
						
							
							QmlDesigner: Prevent item hoping for reparenting  
						
						... 
						
						
						
						Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.
Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com > 
						
						
					 
					
						2011-07-06 18:19:28 +02:00 
						 
				 
			
				
					
						
							
							
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						8fe3302329 
					 
					
						
						
							
							QmlDesigner.NodeInstances: Move qmlpuppet to share  
						
						... 
						
						
						
						Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com > 
						
						
					 
					
						2011-06-22 18:24:36 +02:00