640441882d
Conflicts: src/network/socket/qnativesocketengine_winrt.cpp Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c |
||
---|---|---|
.. | ||
bootstrap | ||
bootstrap-dbus | ||
moc | ||
qdbuscpp2xml | ||
qdbusxml2cpp | ||
qlalr | ||
rcc | ||
uic |
640441882d
Conflicts: src/network/socket/qnativesocketengine_winrt.cpp Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c |
||
---|---|---|
.. | ||
bootstrap | ||
bootstrap-dbus | ||
moc | ||
qdbuscpp2xml | ||
qdbusxml2cpp | ||
qlalr | ||
rcc | ||
uic |