Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| BLACKLIST | ||
| qhostinfo.pro | ||
| tst_qhostinfo.cpp | ||
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| BLACKLIST | ||
| qhostinfo.pro | ||
| tst_qhostinfo.cpp | ||