Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
resources	Rename createLocalFile to createNativeFile & deprecate createLocalFile	2012-10-02 10:43:48 +02:00
.gitignore	…
android_testdata.qrc	Android: Fix QTemporaryFile tests	2015-01-08 10:06:50 +01:00
qtemporaryfile.pro	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qtemporaryfile.qrc	Rename createLocalFile to createNativeFile & deprecate createLocalFile	2012-10-02 10:43:48 +02:00
tst_qtemporaryfile.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00