diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-20 21:07:40 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-21 14:39:01 +0000 |
| commit | 4af4bd7a84df303582e13785103849a297ea38ae (patch) | |
| tree | 9fe550976a070627700e32861cd83576c7cf4722 /src | |
| parent | 88c98b906eba57eedd82619f7000f9114f79c54e (diff) | |
Fix java.pro
Change-Id: I0e3d0a39144c2dbc6db91af559241b251c29c1c8
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/java.pro | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/java/java.pro b/src/java/java.pro index a4bdb91..26a955e 100644 --- a/src/java/java.pro +++ b/src/java/java.pro @@ -21,13 +21,7 @@ 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) - +contains(QT_CONFIG, private_tests) { # -developer-build QMAKE_POST_LINK += \ - $${QMAKE_COPY_DIR} $$shell_path($$PWD/src) $$OUT_PATH + $${QMAKE_COPY_DIR} $$shell_path($$PWD/src) $$shell_path($$javaresources.path) } |