Conflicts: src/qml/jit/qv4targetplatform_p.h src/quick/accessible/qaccessiblequickitem_p.h Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d |
||
---|---|---|
.. | ||
images | ||
Label.qml | ||
etcprovider.cpp | ||
etcprovider.h | ||
main.cpp | ||
textureprovider.pro | ||
textureprovider.qml | ||
textureprovider.qrc |