Frederik Gladhorn f6dbdd9c16 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd		2013-12-05 18:52:38 +01:00
..
integrity	fix warnings about unused variables & parameters	2013-11-04 19:50:05 +01:00
mac	Show all of the internal included files in the Supporting Files group	2013-11-22 12:53:04 +01:00
unix	complete implementation of force_debug_info	2013-12-03 09:14:59 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2013-12-05 18:52:38 +01:00
makefile.cpp	complete implementation of force_debug_info	2013-12-03 09:14:59 +01:00
makefile.h	adequately shell-escape generated sed commands	2013-11-23 19:58:11 +01:00
makefiledeps.cpp	remove support for Qtopia's QOM_OBJECT macro	2013-08-26 12:21:40 +02:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
projectgenerator.h	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00