Frederik Gladhorn ca2f44680c Merge branch 'stable' into dev ... Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3		2013-01-04 11:12:05 +01:00
..
images	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
arthurstyle.cpp	QtBase: Fix painting example arthur background color	2012-11-30 00:53:07 +01:00
arthurstyle.h	QtBase: Fix painting example arthur background color	2012-11-30 00:53:07 +01:00
arthurwidgets.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
arthurwidgets.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
hoverpoints.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
hoverpoints.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
shared.pri	Merge branch 'stable' into dev	2013-01-04 11:12:05 +01:00
shared.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
shared.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00