qt5base-lts/tests/auto/qtextedit
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
..
fullWidthSelection Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.gitignore Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtextedit.pro Merge branch 'master' into refactor 2011-08-25 12:48:52 +02:00
tst_qtextedit.cpp Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00