64df0eda36
Conflicts: src/corelib/global/qlogging.cpp src/gui/painting/qtextureglyphcache_p.h src/gui/text/qfontengine.cpp src/widgets/widgets/qlineedit.cpp Change-Id: Ic8798538df466b7141caa8bbf1fb7605eb56be37 |
||
---|---|---|
.. | ||
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 |