0aa2d318b1
Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qfontdialog.pro | ||
testfonts.qrc | ||
tst_qfontdialog_mac_helpers.mm | ||
tst_qfontdialog.cpp |