Conflicts:
src/widgets/widgets/qabstractbutton.cpp
src/widgets/widgets/qbuttongroup.cpp
src/widgets/widgets/qbuttongroup.h
src/widgets/widgets/qsplashscreen.cpp
tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
tests/benchmarks/opengl/main.cpp
Needed update:
src/plugins/platforms/cocoa/CMakeLists.txt
Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5
|
||
|---|---|---|
| .. | ||
| doc | ||
| generators | ||
| library | ||
| .prev_CMakeLists.txt | ||
| CMakeLists.txt | ||
| 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 | ||