Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480 |
||
|---|---|---|
| .. | ||
| qfiledialog2.pro | ||
| tst_qfiledialog2.cpp | ||
Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480 |
||
|---|---|---|
| .. | ||
| qfiledialog2.pro | ||
| tst_qfiledialog2.cpp | ||