diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 01:00:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 01:00:34 +0200 |
| commit | 134ee9d548c1289f8bb4c7fb5302db37a9437dfe (patch) | |
| tree | 28bcb842a92c69a3244a969948dd0425f92cbe44 /mkspecs | |
| parent | df7c97f8eed00a1dcd24a815d89d2842f7d6d116 (diff) | |
| parent | 57eed823e412d587e051bff0d4775f08024d4169 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4cb91777e7ae9f462fa219d5b9ebeb277fde49c3
Diffstat (limited to 'mkspecs')
| -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 |