Liang Qi 01bc69f99f Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973		2017-09-20 11:58:32 +02:00
..
testdata/paintEvent	…
.gitignore	…
BLACKLIST	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-06 13:26:31 +02:00
geometry-fullscreen.dat	…
geometry-maximized.dat	…
geometry.dat	…
qwidget.pro	Remove remaining Carbon includes from QtCore, QtGui and QtWidgets	2017-03-07 01:04:40 +00:00
qwidget.qrc	…
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-20 11:58:32 +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