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
..
moc	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
qdbuscpp2xml	Bootstrap qdbuscpp2xml.	2012-03-18 14:14:42 +01:00
qmake	Fix some compiler warnings in tests.	2012-03-27 16:35:39 +02:00
rcc	New qHash algorithm for uchar/ushort arrays (QString, QByteArray, etc.)	2012-04-09 10:16:09 +02:00
uic	Use "qt-project.org" instead of "trolltech" in the resource system	2012-03-28 07:50:06 +02:00
tools.pro	Bootstrap qdbuscpp2xml.	2012-03-18 14:14:42 +01:00