Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||
Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||