diff options
Diffstat (limited to 'mkspecs/features/java.prf')
| -rw-r--r-- | mkspecs/features/java.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 05350db48d..029c3812e0 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -50,7 +50,11 @@ QMAKE_EXTENSION_SHLIB = jar # Override linker with dex (for Android) or jar (for other java builds) android { QMAKE_LINK_O_FLAG = --output= - QMAKE_LINK = $$SDK_ROOT/platform-tools/dx --dex + contains(QMAKE_HOST.os, Windows) { + QMAKE_LINK = $$PWD/data/android/dx $$SDK_ROOT --dex + } else { + QMAKE_LINK = $$SDK_ROOT/platform-tools/dx --dex + } } else { QMAKE_LINK_O_FLAG = "cf " QMAKE_LINK = jar |