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
..
dom	Update Qt 5 to-do comment in QDom.	2012-04-11 19:14:43 +02:00
sax	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
xml.pro	Revert "Put the generated <module>version.h into build tree"	2012-02-01 10:48:09 +01:00