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
..
qstandardpaths.pro	Fixed installation of corelib tests	2011-12-01 09:12:52 +01:00
tst_qstandardpaths.cpp	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00