739585b2f5
Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9 |
||
---|---|---|
.. | ||
ioutils.cpp | ||
ioutils.h | ||
proitems.cpp | ||
proitems.h | ||
qmake_global.h | ||
qmakebuiltins.cpp | ||
qmakeevaluator_p.h | ||
qmakeevaluator.cpp | ||
qmakeevaluator.h | ||
qmakeglobals.cpp | ||
qmakeglobals.h | ||
qmakeparser.cpp | ||
qmakeparser.h | ||
qmakevfs.cpp | ||
qmakevfs.h |