diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-03-07 14:36:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 15:26:37 +0100 |
| commit | 0300f56133d20fabdd303f5109ccd0c7a1eda9f5 (patch) | |
| tree | 1e0a0092821356014243d3845cb8c4fdcd6faba0 /src/android/java/java.pro | |
| parent | 0541f65efaf15e87ba8abecc070b457ef7d89e35 (diff) | |
Make android non-prefix shadow build usable
Until now android developer build was not usable due to missing files.
These files are only available after a make install.
This patch aims to add that copy phase when building.
Task-number: QTBUG-36901
Change-Id: If0a7e982899b8c18495c7cb6508184fa153b239d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/android/java/java.pro')
| -rw-r--r-- | src/android/java/java.pro | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/android/java/java.pro b/src/android/java/java.pro index 9d682e4f23..cff2d55d86 100644 --- a/src/android/java/java.pro +++ b/src/android/java/java.pro @@ -9,3 +9,17 @@ javaresources.files = \ javaresources.path = $$[QT_INSTALL_PREFIX]/src/android/java INSTALLS += javaresources + +!prefix_build:!equals(OUT_PWD, $$PWD) { + RETURN = $$escape_expand(\\n\\t) + equals(QMAKE_HOST.os, Windows) { + RETURN = $$escape_expand(\\r\\n\\t) + } + OUT_PATH = $$shell_path($$OUT_PWD) + + QMAKE_POST_LINK += \ + $${QMAKE_COPY} $$shell_path($$PWD/AndroidManifest.xml) $$OUT_PATH $$RETURN \ + $${QMAKE_COPY} $$shell_path($$PWD/version.xml) $$OUT_PATH $$RETURN \ + $${QMAKE_COPY_DIR} $$shell_path($$PWD/res) $$OUT_PATH $$RETURN \ + $${QMAKE_COPY_DIR} $$shell_path($$PWD/src) $$OUT_PATH +} |