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
|
||
|---|---|---|
| .. | ||
| externalsites | ||
| includes | ||
| includes-online | ||
| template | ||
| compat.qdocconf | ||
| config.qdocconf | ||
| externalsites.qdocconf | ||
| fileextensions.qdocconf | ||
| html-config.qdocconf | ||
| html-footer-online.qdocconf | ||
| html-footer.qdocconf | ||
| html-header-offline.qdocconf | ||
| html-header-online.qdocconf | ||
| macros.qdocconf | ||
| manifest-meta.qdocconf | ||
| qt-cpp-defines.qdocconf | ||
| qt-html-templates-offline-simple.qdocconf | ||
| qt-html-templates-offline.qdocconf | ||
| qt-html-templates-online.qdocconf | ||
| qt-module-defaults-offline.qdocconf | ||
| qt-module-defaults-online-commercial.qdocconf | ||
| qt-module-defaults-online.qdocconf | ||
| qt-module-defaults.qdocconf | ||