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
..
syslocaleapp	Fixed qlocale unittest to install subprogram syslocaleapp correctly	2012-03-01 05:43:19 +01:00
test	test: marked tst_qlocale as insignificant on Windows	2012-04-13 07:18:24 +02:00
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
qlocale.pro	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
tst_qlocale.cpp	Merge master into api_changes	2012-03-27 19:22:48 +02:00