diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:47:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:47:45 +0200 |
| commit | 883951928fc6d5c0d06c24a9a1790eeb805b1587 (patch) | |
| tree | 243e00da0c28078f53fbb88d133582e5f475a9ec /mkspecs | |
| parent | 3523c9e138dc8591619d21f24f60ded27bd7e7e3 (diff) | |
| parent | 9e36747786b31c9494f99af5e1f7c977b51b7ce7 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I0a8fe79a80b7720f76e3c0b03cc2c9a769d4009b
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/java.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 7360103757..411a839ad8 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -62,8 +62,8 @@ android:!bundled_jar_file { } else { DEX_CMD = $$SDK_ROOT/platform-tools/dx !exists($$DEX_CMD): DEX_CMD = $$SDK_ROOT/build-tools/$$BUILD_TOOLS_REVISION/dx + !exists($$DEX_CMD): error("The path $$DEX_CMD does not exist. Please set the environment variable ANDROID_BUILD_TOOLS_REVISION to the revision of the build tools installed in your Android SDK.") } - !exists($$DEX_CMD): error("The path $$DEX_CMD does not exist. Please set the environment variable ANDROID_BUILD_TOOLS_REVISION to the revision of the build tools installed in your Android SDK.") QMAKE_LINK_SHLIB_CMD = $$DEX_CMD --dex --output $(TARGET) $$CLASS_DIR } else { QMAKE_LINK_SHLIB_CMD = jar cf $(TARGET) -C $$CLASS_DIR . |