Oswald Buddenhagen 143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3		2012-04-10 15:31:45 +02:00
..
image	Make tst_qmovie work in shadow builds	2012-03-22 18:59:45 +01:00
kernel	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
math3d	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
painting	Fix MSVC warnings in tests.	2012-04-02 16:56:48 +02:00
qopengl	Fix MSVC warnings in tests.	2012-04-02 16:56:48 +02:00
text	Harfbuzz-thai - fix buffer overflow when setting item attributes	2012-04-02 14:52:48 +02:00
util	Restore Qt4 compat in QDesktopServices::DataLocation	2012-03-24 19:07:22 +01:00
gui.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00