Gunnar Sletta 04d0a9626c Merge branch 'master' into refactor ... Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74		2011-08-25 12:48:52 +02:00
..
examples	Fix typo in padnavigator example docs	2011-07-28 10:04:31 +02:00
files-and-resources	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
images	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
network-programming	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
objectmodel	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
painting-and-printing	Change references to affine example.	2011-06-28 14:20:17 +02:00
snippets	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
sql-programming	Move the books example in the docs.	2011-06-29 13:44:13 +02:00
tutorials	Remove more references to demos.	2011-07-08 15:36:26 +02:00
widgets-and-layouts	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
windows-and-dialogs	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00