97417e8f28
Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a |
||
---|---|---|
.. | ||
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 |