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
..
qgraphicstransform.pro	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
tst_qgraphicstransform.cpp	test: only QEXPECT_FAIL tst_qgraphicstransform in release mode	2011-08-10 03:56:36 +02:00