97417e8f28
Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a |
||
---|---|---|
.. | ||
animation | ||
codecs | ||
global | ||
io | ||
itemmodels | ||
kernel | ||
mimetypes | ||
plugin | ||
serialization | ||
statemachine | ||
text | ||
thread | ||
time | ||
tools | ||
corelib.pro |