diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-24 17:12:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-24 18:36:41 +0000 |
| commit | c7170915c722cb9deea5141a8b06cfb87c5d682d (patch) | |
| tree | 30db43482060215f51982d511c75e3a662befa9e /mkspecs/features | |
| parent | d2b2511f88d3cf0b3db65c1bb5836e08e50636ab (diff) | |
| parent | c97eb3e18ec0326a469ef37997f6368cf029c766 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 913ab71412..e6b2431f9a 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -1,4 +1,4 @@ -contains(TEMPLATE, ".*app"):!build_pass: { +contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { defineReplace(emitString) { return("\"$$replace(1, \\\\, \\\\)\"") |