Liang Qi d25c322729 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/network/ssl/qsslsocket_openssl.cpp src/platformsupport/vkconvenience/qvkconvenience.cpp Change-Id: I97ce6ed185f7fdad8102cc58d3cfec0119fd7bb4		2019-07-01 10:21:37 +02:00
..
android.prf	Say hello to $ make apk	2019-06-06 15:31:29 +03:00
android_deployment_settings.prf	Android: Nuke mips architectures	2019-05-06 08:01:04 +00:00
resolve_target.prf	don't auto-create install targets for static libs	2017-06-17 06:47:59 +00:00
sdk.prf	Android: Set minimum supported version to android-21	2019-01-23 15:21:56 +00:00
spec_post.prf	Fix build with Android NDK's make on Windows	2019-06-28 15:13:34 +02:00