diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
| commit | d25c3227299a6a281db37e68e45f0b02db3f5297 (patch) | |
| tree | 08f436f8aebe2c8aaaee570f88e71bd2d0c8f6e7 /mkspecs/features/android | |
| parent | 222b81f5dac2a5d32027b15d3a784819291431f6 (diff) | |
| parent | a39b19b0c7419021b3c22dc4d4bced0995f3a29f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl.cpp
src/platformsupport/vkconvenience/qvkconvenience.cpp
Change-Id: I97ce6ed185f7fdad8102cc58d3cfec0119fd7bb4
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/spec_post.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/android/spec_post.prf b/mkspecs/features/android/spec_post.prf new file mode 100644 index 0000000000..4d11efb2cf --- /dev/null +++ b/mkspecs/features/android/spec_post.prf @@ -0,0 +1,6 @@ +load(spec_post) + +# Work around idiosyncracy in Android NDK's make executable +# which tries to call the shell-builtin "move" as direct process +equals(QMAKE_HOST.os, Windows):equals(QMAKE_MOVE, move): \ + QMAKE_MOVE = cmd /c move |