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 |
||
|---|---|---|
| .. | ||
| mingw_make.cpp | ||
| mingw_make.h | ||
| msbuild_objectmodel.cpp | ||
| msbuild_objectmodel.h | ||
| msvc_nmake.cpp | ||
| msvc_nmake.h | ||
| msvc_objectmodel.cpp | ||
| msvc_objectmodel.h | ||
| msvc_vcproj.cpp | ||
| msvc_vcproj.h | ||
| msvc_vcxproj.cpp | ||
| msvc_vcxproj.h | ||
| winmakefile.cpp | ||
| winmakefile.h | ||