Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a |
||
|---|---|---|
| .. | ||
| cesdkhandler.cpp | ||
| cesdkhandler.h | ||
| 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 | ||