Conflicts: qmake/generators/makefile.cpp qmake/generators/unix/unixmake2.cpp src/corelib/thread/qthread_unix.cpp tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408 |
||
|---|---|---|
| .. | ||
| cmake | ||
| mac | ||
| testserver | ||
| unix | ||
| configure.json | ||
| dummy.cpp | ||
| dumpvcvars.bat | ||
| macros.cpp | ||