Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/macx-ios-clang/features/resolve_config.prf qtbase.pro Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea |
||
|---|---|---|
| .. | ||
| ioutils.cpp | ||
| ioutils.h | ||
| proitems.cpp | ||
| proitems.h | ||
| qmake_global.h | ||
| qmakebuiltins.cpp | ||
| qmakeevaluator.cpp | ||
| qmakeevaluator.h | ||
| qmakeevaluator_p.h | ||
| qmakeglobals.cpp | ||
| qmakeglobals.h | ||
| qmakeparser.cpp | ||
| qmakeparser.h | ||
| qmakevfs.cpp | ||
| qmakevfs.h | ||