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
..
stressTest	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
test	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qtcpsocket.pro	test: really marked tst_qtcpsocket autotest as unstable	2011-08-23 04:57:58 +02:00
tst_qtcpsocket.cpp	IPv4 + IPv6 dual stack sockets	2011-06-22 11:01:00 +02:00