Tobias Hunger 
							
						 
					 
					
						
						
							
						
						397e7f4843 
					 
					
						
						
							
							Update License according to agreement with Free Qt Foundation  
						
						... 
						
						
						
						* Update files in src/plugins
Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2016-01-19 15:57:01 +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 
						 
				 
			
				
					
						
							
							
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						7ed1576083 
					 
					
						
						
							
							Clean up single namespace forward-declarations  
						
						... 
						
						
						
						Done using the following ruby script:
Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}
Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com > 
						
						
					 
					
						2014-02-12 09:30:37 +01:00 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						236ea9efb9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/3.0'  
						
						... 
						
						
						
						Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d 
						
						
					 
					
						2014-01-08 11:01:06 +01: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 
						 
				 
			
				
					
						
							
							
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						deb43b4c8a 
					 
					
						
						
							
							Preferences: Add default implementation for filtering  
						
						... 
						
						
						
						The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.
Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2013-12-10 13:31:48 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						4b0bafd615 
					 
					
						
						
							
							Clean headers in CppTools.  
						
						... 
						
						
						
						Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com > 
						
						
					 
					
						2013-04-10 10:55:14 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						7923032022 
					 
					
						
						
							
							fix include style relating to cplusplus libraries  
						
						... 
						
						
						
						... and adjust INCLUDEPATH accordingly.
while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.
Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2013-04-03 13:40:39 +02: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						f77cd29e54 
					 
					
						
						
							
							IOptionsPage: replace virtual fuctions by data members  
						
						... 
						
						
						
						Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2012-05-23 10:48:04 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						3fa55b7ab9 
					 
					
						
						
							
							Removed module names from #include directives.  
						
						... 
						
						
						
						Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2012-02-15 16:24:46 +01: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 
						 
				 
			
				
					
						
							
							
								Jarek Kobus 
							
						 
					 
					
						
						
							
						
						2244911826 
					 
					
						
						
							
							Implement Code Style schemes  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-5092
Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160 
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com > 
						
						
					 
					
						2011-09-23 10:23:15 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						7ffd2e8b9f 
					 
					
						
						
							
							Add missing license headers.  
						
						... 
						
						
						
						Change-Id: I2dc5d18bfffc8389ad0b162b7dc3b5cc2406027f
Reviewed-on: http://codereview.qt.nokia.com/1222 
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com > 
						
						
					 
					
						2011-07-06 11:17:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jarek Kobus 
							
						 
					 
					
						
						
							
						
						c98e7c2b83 
					 
					
						
						
							
							Small refactor, preparation for built-in settings  
						
						... 
						
						
						
						Change-Id: I91de7a01aba37f41398df7b06dbe5af868094379
Reviewed-on: http://codereview.qt.nokia.com/615 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com > 
						
						
					 
					
						2011-06-22 15:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						c44ca6df6f 
					 
					
						
						
							
							Avoid a lot of updates when CppCodeStyleSettingsPage is created  
						
						... 
						
						
						
						This helps to reduce the lag when typing in the preference's filter
edit.
Task-number: QTCREATORBUG-5065
Change-Id: I26634a47b21df1402a53037864bb0c334eba8078
Reviewed-on: http://codereview.qt.nokia.com/572 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com > 
						
						
					 
					
						2011-06-22 10:08:39 +02:00 
						 
				 
			
				
					
						
							
							
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						61325aae0d 
					 
					
						
						
							
							Editors: Make snippets and code style honor font settings  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-5007
Change-Id: Ied78ef17ea7a25d22c37d36fd4eb7257c6c9f4c0
Reviewed-on: http://codereview.qt.nokia.com/293 
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com > 
						
						
					 
					
						2011-06-01 11:21:13 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						312f6d0ff1 
					 
					
						
						
							
							C++ style settings: Compile fix for namespaced Qt.  
						
						... 
						
						
						
						Change-Id: I89db5239576385823315443474669f5fd9ef69b4
Reviewed-on: http://codereview.qt.nokia.com/87 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: hjk 
						
						
					 
					
						2011-05-24 16:00:06 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						779fafcbfe 
					 
					
						
						
							
							Make C++ code style configurable.  
						
						... 
						
						
						
						Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74 
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com >
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com >
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com > 
						
						
					 
					
						2011-05-24 12:45:07 +02:00