Oswald Buddenhagen 76c0be34cd Merge branch 'dev' into stable ... This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b		2013-03-20 13:49:28 +01:00
..
task71021	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Test.framework/Headers	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
testproject	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
.gitattributes	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
.gitignore	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
assign-namespace.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
backslash-newlines.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
c-comments.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cstyle-enums.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cxx11-enums.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
cxx11-explicit-override-control.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
cxx11-final-classes.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
dir-in-include-path.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
dollars.h	moc: Support the '$' character as an identifier	2013-03-02 12:58:18 +01:00
error-on-wrong-notify.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
escapes-in-string-literals.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
extraqualification.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
forgotten-qinterface.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
forward-declared-param.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
function-with-attributes.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
gadgetwithnoenums.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
Header	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
interface-from-framework.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
macro-on-cmdline.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
moc.pro	moc: Support the '$' character as an identifier	2013-03-02 12:58:18 +01:00
namespaced-flags.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
no-keywords.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
oldstyle-casts.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
os9-newlines.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
parse-boost.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
parse-defines.h	Fix tst_moc when variadic macros are enabled	2013-03-17 10:57:49 +01:00
pp-dollar-signs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
pure-virtual-signals.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qinvokable.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprivateslots.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
single_function_keyword.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
slots-with-void-template.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
task87883.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
task189996.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
task192552.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
task234909.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
task240368.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
template-gtgt.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
trigraphs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
tst_moc.cpp	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
unterminated-function-macro.h	moc: Error out when detecting unterminated macro usage	2013-02-19 20:51:44 +01:00
using-namespaces.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
warn-on-multiple-qobject-subclasses.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
warn-on-property-without-read.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
win-newlines.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00