Eike Ziller 
							
						 
					 
					
						
						
							
						
						bf97079be3 
					 
					
						
						
							
							Fix cancelling search for usages.  
						
						 
						
						... 
						
						
						
						Change-Id: Ic78cf5030e78759018ea84d0c258c81c8081ae98
Reviewed-by: Leandro Melo <leandro.melo@nokia.com > 
						
						
					 
					
						2011-12-20 13:15:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						11907bc072 
					 
					
						
						
							
							Fix starting a usage search while another one is running.  
						
						 
						
						... 
						
						
						
						Theoretically it could now run multiple searches in parallel, but since
a single search grabs all available threads from the pool, any search
request afterwards is queued for execution when the previous one
finished.
Task-number: QTCREATORBUG-6101
Change-Id: Ifada0ccdd1ce7cfb4aaaaa4de2db070025f91a3a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com > 
						
						
					 
					
						2011-12-20 12:21:34 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						82f5573626 
					 
					
						
						
							
							more Id type fixes  
						
						 
						
						... 
						
						
						
						Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283
x
Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com > 
						
						
					 
					
						2011-11-10 15:57:09 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						fdeb7620f1 
					 
					
						
						
							
							Keep multiple search results in history.  
						
						 
						
						... 
						
						
						
						Change-Id: I7350c78479343e85b1ca4957e08bccefb5756d20
Reviewed-on: http://codereview.qt-project.org/4556 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com > 
						
						
					 
					
						2011-09-14 10:55:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						1e47de1416 
					 
					
						
						
							
							Move advanced search dialog into search result pane.  
						
						 
						
						... 
						
						
						
						And move the cancel button into the specific search result widget.
Change-Id: Ide8173e1ec5de091e1c1332a2b0c47d9a30a4c87
Reviewed-on: http://codereview.qt-project.org/4555 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com >
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2011-09-13 15:38:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						5990b039e8 
					 
					
						
						
							
							Show more info about a search and move UI for replacing  
						
						 
						
						... 
						
						
						
						Change-Id: I6e024583c0d778a65007eb4590118c4329b2118a
Reviewed-on: http://codereview.qt-project.org/4554 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com >
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2011-09-13 15:37:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						0594887dea 
					 
					
						
						
							
							Move and cleanup search specific API to SearchResult class  
						
						 
						
						... 
						
						
						
						Change-Id: I7e64701e8833ad38b9ac01d316bd00302602a390
Rubber-stamped-by: Daniel Teske
Reviewed-on: http://codereview.qt.nokia.com/4179 
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2011-09-06 17:05:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						743b5b7431 
					 
					
						
						
							
							C++ editor: Normalize line endings for find usages  
						
						 
						
						... 
						
						
						
						Find usages and related rely on functions that assume \n as line
ending. This is true for the preprocessed files, but not for the
original sources.
Change-Id: I61b7e05c0116504d11c7df4b1aa10d519b705336
Reviewed-on: http://codereview.qt.nokia.com/260 
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com > 
						
						
					 
					
						2011-05-31 12:06:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						a14955d0fb 
					 
					
						
						
							
							move the "cannot undo" warning to the search result pane  
						
						 
						
						... 
						
						
						
						this is where it belongs, rather than into some arbitrary editor.
as a nice side effect, now not only the "rename symbol", but also the
global search&replace has such a warning. 
						
						
					 
					
						2011-05-12 20:10:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						882e34ee28 
					 
					
						
						
							
							rewrite editor info bar handling  
						
						 
						
						... 
						
						
						
						the info about the bars is now stored in the IFile, not in the
EditorView. this is somewhat more expensive for the bars which
identically apply to all editors of one type, but fixes consistency
issues between views.
additionally, it is now possible to set several simultaneous
info bars per file, which ensures that no information is lost.
Co-authored-by: mae 
						
						
					 
					
						2011-05-12 20:10:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						aa2acec14c 
					 
					
						
						
							
							Fix/add copyright headers  
						
						 
						
						... 
						
						
						
						Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2 
						
						
					 
					
						2011-05-06 15:17:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						45c9cf7a12 
					 
					
						
						
							
							add/unify i/o error handling  
						
						 
						
						... 
						
						
						
						lots of use of Utils::FileSaver and Utils::FileReader
Task-number: QTCREATORBUG-1619 
						
						
					 
					
						2011-04-18 14:10:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8397663964 
					 
					
						
						
							
							Update license.  
						
						 
						
						
						
						
					 
					
						2011-04-13 11:49:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						f576ad9f2c 
					 
					
						
						
							
							texteditor: merge ITextEditable into ITextEditor  
						
						 
						
						... 
						
						
						
						rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings 
						
						
					 
					
						2011-02-22 11:23:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						dea74862d3 
					 
					
						
						
							
							Fixed the line retreival for find-usages.  
						
						 
						
						... 
						
						
						
						Instead of using the pre-processed source, the original one is used.
This makes a difference when a macro is used in the line, where the pre-
processed source would have a "#gen true" token.
Task-number: QTCREATORBUG-3345 
						
						
					 
					
						2011-01-17 14:47:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						d1023c7614 
					 
					
						
						
							
							It's 2011 now.  
						
						 
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2011-01-12 09:46:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						5f50a6ae34 
					 
					
						
						
							
							C++: Move the ModelManagerInterface from CppTools to CPlusPlus.  
						
						 
						
						
						
						
					 
					
						2011-01-04 15:58:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						 
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dt 
							
						 
					 
					
						
						
							
						
						08ccda5862 
					 
					
						
						
							
							EditorManager: Change openEditor/activateEditor to not do mode switching  
						
						 
						
						... 
						
						
						
						Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode 
						
						
					 
					
						2010-09-14 15:23:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						12ac55429c 
					 
					
						
						
							
							C++: put dependency table calculation into the future.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2300 
						
						
					 
					
						2010-09-10 14:18:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						05f2fd6669 
					 
					
						
						
							
							Renamed Symbol::scope() to Symbol::enclosingScope().  
						
						 
						
						
						
						
					 
					
						2010-08-26 16:16:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						354b9712e4 
					 
					
						
						
							
							Merged ScopedSymbol and Scope.  
						
						 
						
						
						
						
					 
					
						2010-08-11 15:25:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0f301f8679 
					 
					
						
						
							
							New implementation of CPlusPlus::FindUsages  
						
						 
						
						
						
						
					 
					
						2010-08-10 15:19:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						672274378b 
					 
					
						
						
							
							Use the most recent snapshot when searching for the usages of a symbol.  
						
						 
						
						
						
						
					 
					
						2010-08-05 13:59:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						f87236de39 
					 
					
						
						
							
							Look at the symbol's visibility.  
						
						 
						
						
						
						
					 
					
						2010-08-05 13:00:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						12ecb527ac 
					 
					
						
						
							
							Simplified FindUsages.  
						
						 
						
						
						
						
					 
					
						2010-08-05 12:49:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						2bda8675e5 
					 
					
						
						
							
							C++ symbols find filter for advanced find.  
						
						 
						
						... 
						
						
						
						Required refactoring of the search result window to show real trees of
search results.
The backend is the backend from the Locator filter, which is a bit
outdated now. 
						
						
					 
					
						2010-07-23 16:34:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ck 
							
						 
					 
					
						
						
							
						
						46f537e56a 
					 
					
						
						
							
							Quickfix: Convert underscore notation to camel case.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-07-20 11:07:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						214e0bf35b 
					 
					
						
						
							
							Add a instance() method to the search result window singleton.  
						
						 
						
						
						
						
					 
					
						2010-07-12 16:17:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						7528b2c63a 
					 
					
						
						
							
							Compute the dependecy table on demand.  
						
						 
						
						
						
						
					 
					
						2010-07-06 14:35:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						1c078ec2a3 
					 
					
						
						
							
							Ensure we keep the context around for as long as it is needed.  
						
						 
						
						
						
						
					 
					
						2010-05-31 12:37:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						405353ab23 
					 
					
						
						
							
							Removed the CppBindings.  
						
						 
						
						
						
						
					 
					
						2010-05-25 17:15:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						bbcacaf59f 
					 
					
						
						
							
							Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.  
						
						 
						
						
						
						
					 
					
						2010-03-18 10:59:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						bfaf247abd 
					 
					
						
						
							
							Use Searching' instead of Sarching...'.  
						
						 
						
						
						
						
					 
					
						2010-03-17 14:37:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						284b8d38e2 
					 
					
						
						
							
							Put the DependencyTable calculation into the QFuture.  
						
						 
						
						... 
						
						
						
						Done-with: Roberto Raggi 
						
						
					 
					
						2010-03-17 14:20:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						1cc5e1fe01 
					 
					
						
						
							
							Put the include depenency table into a separate class, and cache it when possible.  
						
						 
						
						
						
						
					 
					
						2010-03-17 14:20:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						417a1c9f28 
					 
					
						
						
							
							Fixed QTCREATORBUG-745.  
						
						 
						
						... 
						
						
						
						Fixed crash in FindUsages on a dirty file in a large project, which is saved
while the FindUsages is still running. 
						
						
					 
					
						2010-03-09 17:38:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						 
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						f90f9e4879 
					 
					
						
						
							
							Find macro uses.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2009-12-21 14:57:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						6c27faf0fc 
					 
					
						
						
							
							Remove unused code.  
						
						 
						
						
						
						
					 
					
						2009-12-21 12:11:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						1a95f6f205 
					 
					
						
						
							
							Implement string based search & replace in multiple files.  
						
						 
						
						... 
						
						
						
						This uses the same UI as "Rename Symbol".
Moves the actual rename implementation to a static method in
BaseFileFind and uses it for rename symbol and search & replace.
Moves the signal notification for the code model from VCSManager to
the more general FileManager.
Note that as for rename symbol, there's no undo yet.
Task-number: QTCREATORBUG-73 
						
						
					 
					
						2009-12-21 11:08:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						aa8a670669 
					 
					
						
						
							
							Hide the implementation details of CppModelManagerInterface::WorkingCopy.  
						
						 
						
						
						
						
					 
					
						2009-12-15 15:26:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						b168eec2a1 
					 
					
						
						
							
							Replaced the hardcoded QHash<QString, QString> with CppModelManagerInterface::WorkingCopy.  
						
						 
						
						
						
						
					 
					
						2009-12-15 15:16:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						bdb4e48ebf 
					 
					
						
						
							
							Store the working list in a QHash.  
						
						 
						
						
						
						
					 
					
						2009-12-07 12:47:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0614e19ddc 
					 
					
						
						
							
							Rename MyProcess and MyReduce.  
						
						 
						
						
						
						
					 
					
						2009-12-07 12:47:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						14376c3c32 
					 
					
						
						
							
							Initial work on the new CPlusPlus::Snapshot.  
						
						 
						
						... 
						
						
						
						Encapsulate the details. 
						
						
					 
					
						2009-12-07 10:54:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						de86a1f4f4 
					 
					
						
						
							
							Removed unused formal argument.  
						
						 
						
						
						
						
					 
					
						2009-12-04 13:30:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						aae5b92125 
					 
					
						
						
							
							Use mappedReduce when searching for the usages of a symbol.  
						
						 
						
						
						
						
					 
					
						2009-12-04 13:04:47 +01:00