ee07b912a1
Conflicts: src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/widgets/qdockarealayout.cpp src/widgets/widgets/qmainwindow.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmainwindowlayout_p.h tests/auto/corelib/tools/qlocale/tst_qlocale.cpp tests/auto/other/macnativeevents/BLACKLIST tests/auto/widgets/widgets/qmenu/BLACKLIST Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567 |
||
---|---|---|
.. | ||
testdata/paintEvent | ||
.gitignore | ||
BLACKLIST | ||
geometry-fullscreen.dat | ||
geometry-maximized.dat | ||
geometry.dat | ||
qwidget.pro | ||
qwidget.qrc | ||
tst_qwidget_mac_helpers.h | ||
tst_qwidget_mac_helpers.mm | ||
tst_qwidget.cpp |