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 |
||
|---|---|---|
| .. | ||
| doc | ||
| generators | ||
| library | ||
| Makefile.unix | ||
| Makefile.unix.macos | ||
| Makefile.unix.mingw | ||
| Makefile.unix.unix | ||
| Makefile.unix.win32 | ||
| Makefile.win32 | ||
| cachekeys.h | ||
| main.cpp | ||
| meta.cpp | ||
| meta.h | ||
| option.cpp | ||
| option.h | ||
| project.cpp | ||
| project.h | ||
| property.cpp | ||
| property.h | ||
| qmake-aux.pro | ||
| qmake.pro | ||
| qmake_pch.h | ||