Lars Knoll 9bd0323551 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e		2012-04-16 12:04:34 +02:00
..
accessibilityinspector	Avoid non-standard indentation of license headers.	2012-01-30 16:40:10 +01:00
corelib/qurl-generateTLDs	Stop relying on qHash always giving the same results	2012-04-08 21:44:26 +02:00
harfbuzz	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
integrity	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
lexgen	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
local_database	QLocale: Merge month name data storage to save 50KB memory	2012-04-03 19:12:27 +02:00
plugintest	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
scripts	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
unicode	UCD-5.0: apply Corrigendum #6	2012-04-15 03:53:07 +02:00
xkbdatagen	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00