Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
testdata/paintEvent	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Tests: Use blacklist for failing tst_qwidget tests	2015-05-26 11:59:02 +00:00
geometry-fullscreen.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry-maximized.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qwidget.pro	Tests: Use blacklist for failing tst_qwidget tests	2015-05-26 11:59:02 +00:00
qwidget.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
tst_qwidget_mac_helpers.h	Update copyright headers	2015-02-11 06:49:51 +00:00
tst_qwidget_mac_helpers.mm	Fixed license headers	2015-02-17 18:46:09 +00:00
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00