Conflicts: src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/styles/qstylehelper_p.h Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb |
||
|---|---|---|
| .. | ||
| 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 | ||