Conflicts: src/corelib/global/qlogging.cpp src/gui/painting/qtextureglyphcache_p.h src/gui/text/qfontengine.cpp src/widgets/widgets/qlineedit.cpp Change-Id: Ic8798538df466b7141caa8bbf1fb7605eb56be37 |
||
|---|---|---|
| .. | ||
| doc | ||
| generators | ||
| library | ||
| Makefile.unix | ||
| Makefile.unix.macos | ||
| Makefile.unix.mingw | ||
| Makefile.unix.unix | ||
| Makefile.unix.win32 | ||
| Makefile.win32 | ||
| cachekeys.h | ||
| main.cpp | ||
| meta.cpp | ||
| meta.h | ||
| option.cpp | ||
| option.h | ||
| project.cpp | ||
| project.h | ||
| property.cpp | ||
| property.h | ||
| qmake-aux.pro | ||
| qmake.pro | ||
| qmake_pch.h | ||