afab1546a7
Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c |
||
---|---|---|
.. | ||
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 |