7f269a5db8
Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839 |
||
---|---|---|
.. | ||
animation | ||
codecs | ||
global | ||
io | ||
itemmodels | ||
json | ||
kernel | ||
mimetypes | ||
plugin | ||
statemachine | ||
thread | ||
tools | ||
xml | ||
corelib.pro |
7f269a5db8
Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839 |
||
---|---|---|
.. | ||
animation | ||
codecs | ||
global | ||
io | ||
itemmodels | ||
json | ||
kernel | ||
mimetypes | ||
plugin | ||
statemachine | ||
thread | ||
tools | ||
xml | ||
corelib.pro |