con 
							
						 
					 
					
						
						
							
						
						d1023c7614 
					 
					
						
						
							
							It's 2011 now.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2011-01-12 09:46:24 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						b1bcf081d8 
					 
					
						
						
							
							Merge branch '2.1'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp 
						
						
					 
					
						2010-12-17 17:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						b4e421062f 
					 
					
						
						
							
							Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers.  
						
						
						
						
					 
					
						2010-12-16 12:05:48 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						fbc005706c 
					 
					
						
						
							
							debugger: Checking size of array in qDumpQByteArray  
						
						
						
						
					 
					
						2010-12-14 15:51:23 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						f9eea7e1ec 
					 
					
						
						
							
							Debugger: Fix broken display of containers with truncated item count.  
						
						... 
						
						
						
						Introduce convention '<>10 items>' meaning <more than 10 items>.
Task-number: QTCREATORBUG-3132 
						
						
					 
					
						2010-11-18 15:42:01 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						6d0f0c7cd3 
					 
					
						
						
							
							debugger: fix auto tests  
						
						... 
						
						
						
						Reviewed-by: Friedemann Kleint 
						
						
					 
					
						2010-10-11 12:35:30 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						f6a1e3b388 
					 
					
						
						
							
							debugger: fix displayed size of QVector in compiled dumpers  
						
						... 
						
						
						
						Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-2634 
						
						
					 
					
						2010-10-08 15:02:48 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						4e281167ee 
					 
					
						
						
							
							Debugger[CDB]: Adapt SharedLib-Dumpers to new std::vector.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2010-10-05 14:25:04 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						272d22f130 
					 
					
						
						
							
							debugger: activate new compiled QDate and QTime dumpers  
						
						
						
						
					 
					
						2010-09-27 13:31:26 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						4e06ffeea9 
					 
					
						
						
							
							debugger: python and c++ dumpers for QDate and QTime  
						
						
						
						
					 
					
						2010-09-27 13:24:57 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						c3594213fd 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc 
						
						
					 
					
						2010-07-13 11:34:44 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						e33b00c9ea 
					 
					
						
						
							
							Conditional compilation for functions which are unused on Windows  
						
						
						
						
					 
					
						2010-07-12 16:06:21 +02:00 
						 
				 
			
				
					
						
							
							
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						5d5f647f3d 
					 
					
						
						
							
							Fix preprocessor directives  
						
						... 
						
						
						
						* The standard says all preprocessor directives have to start
   at column 0. 
						
						
					 
					
						2010-06-10 13:28:14 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						1b3e9db046 
					 
					
						
						
							
							debugger: implement "old" QSize and QSizeF dumpers, re-enable QImage/QPixmap  
						
						
						
						
					 
					
						2010-05-28 15:48:20 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						59af793953 
					 
					
						
						
							
							debugger: polish address display. also remove the mostly unused 'stored' address  
						
						
						
						
					 
					
						2010-03-23 14:48:32 +01:00 
						 
				 
			
				
					
						
							
							
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						7b284e1c98 
					 
					
						
						
							
							Gdb: Fix compilation warning  
						
						... 
						
						
						
						Done together with hjk 
						
						
					 
					
						2010-03-22 09:37:27 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						6283c1a4db 
					 
					
						
						
							
							debugger: make clang happy  
						
						
						
						
					 
					
						2010-03-10 11:44:49 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						11cb488dc5 
					 
					
						
						
							
							debugger: make helper compilable with Qt 4.4  
						
						
						
						
					 
					
						2010-03-09 14:35:58 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						2fd8b2d7ff 
					 
					
						
						
							
							Fix some code scanning issues.  
						
						... 
						
						
						
						QString: Use QChar where appropriate. 
						
						
					 
					
						2010-02-01 12:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						75b42f18d8 
					 
					
						
						
							
							Merge remote branch 'origin/1.3'  
						
						... 
						
						
						
						Trailing whitespace removal re-applied manually. 
						
						
					 
					
						2010-01-29 22:50:23 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						a6ca348636 
					 
					
						
						
							
							remove trailing whitespace  
						
						... 
						
						
						
						doing it in 1.3 as well to avoid possible later conflicts 
						
						
					 
					
						2010-01-29 21:33:57 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						ebff16f8b1 
					 
					
						
						
							
							debugger: fix dumper for QString::isNull()  
						
						
						
						
					 
					
						2009-12-01 17:11:09 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						e2cfc0958e 
					 
					
						
						
							
							debugger: mark 'Null' QStrings() in pretty-printers  
						
						
						
						
					 
					
						2009-11-20 10:11:21 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						80a112f677 
					 
					
						
						
							
							debugger: make QVariant dumper compile with QT_NO_SHORTCUT  
						
						
						
						
					 
					
						2009-11-12 09:25:42 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						5eadf2bef7 
					 
					
						
						
							
							debugger: simplify QList dumper  
						
						
						
						
					 
					
						2009-11-06 10:15:19 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						c91aca64e6 
					 
					
						
						
							
							debugger: fix item count for QLists with more than 1000 elements  
						
						... 
						
						
						
						Reviewed-by: Oswald Buddenhagen 
						
						
					 
					
						2009-11-04 18:31:27 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						36a4fddaf0 
					 
					
						
						
							
							less confusing: use the data type which was meant  
						
						
						
						
					 
					
						2009-10-30 17:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						2eade14143 
					 
					
						
						
							
							remove superfluous casts  
						
						
						
						
					 
					
						2009-10-30 17:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						0b37be6e22 
					 
					
						
						
							
							Debugger: Completely replace C99 uintptr_t type by quintptr.  
						
						
						
						
					 
					
						2009-10-30 09:16:27 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						09f77930bc 
					 
					
						
						
							
							Debugger: Do not use C99 types for pointers in sprintf() formats.  
						
						... 
						
						
						
						Pointer fit into long or long long (Win64).
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2009-10-29 15:13:49 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9d4b70053a 
					 
					
						
						
							
							debugger: allow NULL pointers in QList<Foo*>  
						
						
						
						
					 
					
						2009-10-28 11:50:39 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						6d9288118f 
					 
					
						
						
							
							Debugger: Add missing include for intptr-types.  
						
						
						
						
					 
					
						2009-10-28 09:51:19 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						695201b02d 
					 
					
						
						
							
							debugger: allow NULL pointers in QVector<Foo*> and QStack<Foo*> dumpers  
						
						
						
						
					 
					
						2009-10-27 16:35:39 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						65e13b7034 
					 
					
						
						
							
							Debugger: Fix autotests on Windows  
						
						... 
						
						
						
						Format pointers consistently using 0x%[l]x in printf/scanf.
Remove %p formatting as the existence of the prefix 0x
is platform-dependent (missing with MSVC), which caused
a scanf error and thus dumper crash for QAbstractItem.
Reviewed-by: ck <qt-info@nokia.com > 
						
						
					 
					
						2009-10-27 12:25:11 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						3fd1e5b23f 
					 
					
						
						
							
							Debugger: Fix exit crash, dump QVariantList with gdb  
						
						... 
						
						
						
						Handle QVariantList within dumpers, as gdb does not resolve
typedefs. Disconnect the gdb process on exit, one more round
of event loop when quitting. 
						
						
					 
					
						2009-10-27 09:51:14 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						a06b3c15c8 
					 
					
						
						
							
							debugger: remove two unused variables  
						
						
						
						
					 
					
						2009-10-21 16:41:28 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						82f47372c3 
					 
					
						
						
							
							CDB: Add consistency checks to dumpers that avoid iterator asserts.  
						
						... 
						
						
						
						_HAS_ITERATOR_DEBUGGING asserts can cause the debugger to be in an
inconsistent state and should thus be avoided. Add checks on the
underlying red/black tree structures using friend helper classes. 
						
						
					 
					
						2009-10-20 16:34:37 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						9e10e11c9c 
					 
					
						
						
							
							CDB: Add further checking to avoid invalid set asserts.  
						
						... 
						
						
						
						Clear a failed call. _HAS_ITERATOR_DEBUGGING can unfortunately
not be turned off as it is not binary compatible with other code. 
						
						
					 
					
						2009-10-19 16:44:07 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						c79476e72f 
					 
					
						
						
							
							debbugger: fix item counts > 1000 in QVector dumper  
						
						
						
						
					 
					
						2009-10-16 14:40:44 +02:00 
						 
				 
			
				
					
						
							
							
								ck 
							
						 
					 
					
						
						
							
						
						4ead5b7202 
					 
					
						
						
							
							Debugger: Dumper fix.  
						
						... 
						
						
						
						- If NSX and NSY have quotes for the QT_NAMESPACE case, they need them
  for the non-namespace case too.
- Dumper autotest: Replace hard-coded namespace with compile-time
  dynamic one. 
						
						
					 
					
						2009-10-14 12:59:39 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						744febe01a 
					 
					
						
						
							
							Debugger/Dumpers: Perform checks on QList/QVector<RawPointer>.  
						
						... 
						
						
						
						Reviewed-by: hjk <qtc-committer@nokia.com > 
						
						
					 
					
						2009-10-13 12:35:47 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						8266c366a3 
					 
					
						
						
							
							CDB: Make use of the improved debugger expression syntax  
						
						... 
						
						
						
						CDB can now handle sizeof(Class) and even expressions that
determine the offset of map node values (to some extent), may still
fail with templates). Format expressions accordingly, adapt
cached expressions.
Use gdbQuoteType depending on debugger type only.
Most important, do not evaluate each expression separately before
issuing the call, as ".call" can now do it on its own. Check for syntax
errors there and cache failing types as before. 
						
						
					 
					
						2009-10-09 14:11:05 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						1fad39c923 
					 
					
						
						
							
							CDB: Fix dumper regression  
						
						... 
						
						
						
						- Do not deref d-ptr when checking on QVariants of PODS
- Make type/value fixing of dumper results more fine-grained
- Allow children in expandPtrToDumpage (QWidget-Pointers)
- Fix broken size cache (queuePrefix was empty)
- Compile 
						
						
					 
					
						2009-10-02 15:17:50 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Belyashov 
							
						 
					 
					
						
						
							
						
						f0a30f4a9b 
					 
					
						
						
							
							Next try to fix pointer aliasing issue  
						
						... 
						
						
						
						Merge-request: 1562
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2009-09-29 19:07:45 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						caa164a4ab 
					 
					
						
						
							
							CDB: Use GdbMi parser for everything.  
						
						... 
						
						
						
						..preparing recursive dumpers. Add recursive parser to
watchutils.cpp Use insertBulkData() within CDB, add sizeof()
information for some Qt containers in order to be able to
dump QList<QList<KnownType> > . 
						
						
					 
					
						2009-09-21 14:55:39 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						603630fad6 
					 
					
						
						
							
							Debugger: Use Gdbmi parser in CDB for parsing of protocol 1  
						
						... 
						
						
						
						Change dumper protocol 1 output not to contain type names as
hash keys (might contain blanks), use lists instead.
Start fixing autotests for 4.6. 
						
						
					 
					
						2009-09-18 16:55:17 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						1500914f5b 
					 
					
						
						
							
							fix pointer aliasing issue  
						
						
						
						
					 
					
						2009-09-18 11:31:00 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						80847e5551 
					 
					
						
						
							
							debugger: disable not very useful QImage dumper for 1.3  
						
						
						
						
					 
					
						2009-09-03 13:32:26 +02:00