7950b6b283
Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d |
||
---|---|---|
.. | ||
Info.plist.app | ||
Info.plist.dSYM.in | ||
Info.plist.lib | ||
qmake.conf | ||
qplatformdefs.h |