Liang Qi 7e1b504f31 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: mkspecs/features/qt_module_headers.prf tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qwidget/BLACKLIST Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c		2018-05-14 14:51:46 +02:00
..
testdata/paintEvent	…
.gitignore	…
BLACKLIST	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-14 14:51:46 +02:00
geometry-fullscreen.dat	…
geometry-maximized.dat	…
geometry.dat	…
qwidget.pro	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
qwidget.qrc	…
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-02 13:15:15 +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