Liang Qi 88cf044580 Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/gui/kernel/qwindow.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowssystemtrayicon.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233		2017-11-09 11:47:57 +01: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	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-16 22:21:52 +03: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	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
qwidget.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
tst_qwidget_mac_helpers.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget_mac_helpers.mm	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00