diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-04 09:47:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-04 09:51:36 +0200 |
| commit | 0936bc54f907066644503c7d4c390968711c73a7 (patch) | |
| tree | 6eb8c614e7083eae6ca619435f901dcb1380108f /mkspecs/features/android | |
| parent | 83080e8a7cb7aaa794a9659eeaf34690afe71ddb (diff) | |
| parent | ffd44acd0de4fc7079e76f1fe4689b655f9dc763 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
config.tests/arch/arch.cpp
src/opengl/qgl_qpa.cpp
src/widgets/kernel/qapplication.cpp
Change-Id: I80b442a4c2c9632743a5b5c7319ff201ec5bc4fd
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 39f151f65d..54d887d088 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -10,9 +10,8 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-no-sdk { FILE_CONTENT += " \"qt\": $$emitString($$[QT_INSTALL_PREFIX])," # Settings from mkspecs/environment - isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT) - isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT - FILE_CONTENT += " \"sdk\": $$emitString($$SDK_ROOT)," + FILE_CONTENT += " \"sdk\": $$emitString($$ANDROID_SDK_ROOT)," + FILE_CONTENT += " \"sdkBuildToolsRevision\": $$emitString($$ANDROID_SDK_BUILD_TOOLS_REVISION)," isEmpty(NDK_ROOT): NDK_ROOT = $$(ANDROID_NDK_ROOT) isEmpty(NDK_ROOT): NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT |