c7934f2489
Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qfontdialog.pro | ||
testfonts.qrc | ||
tst_qfontdialog_mac_helpers.mm | ||
tst_qfontdialog.cpp |