Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973 |
||
|---|---|---|
| .. | ||
| 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.pri | ||
| qmake.pro | ||
| qmake_pch.h | ||