Conflicts: .qmake.conf qmake/generators/makefile.cpp Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e |
||
|---|---|---|
| .. | ||
| cmake | ||
| mac | ||
| testserver | ||
| unix | ||
| configure.json | ||
| dummy.cpp | ||
| dumpvcvars.bat | ||
| macros.cpp | ||
Conflicts: .qmake.conf qmake/generators/makefile.cpp Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e |
||
|---|---|---|
| .. | ||
| cmake | ||
| mac | ||
| testserver | ||
| unix | ||
| configure.json | ||
| dummy.cpp | ||
| dumpvcvars.bat | ||
| macros.cpp | ||