77da617dc8
Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085 |
||
---|---|---|
.. | ||
animation | ||
codecs | ||
global | ||
io | ||
itemmodels | ||
json | ||
kernel | ||
mimetypes | ||
plugin | ||
statemachine | ||
thread | ||
tools | ||
xml | ||
corelib.pro |