diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 10:03:28 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 09:04:00 +0000 |
| commit | 6840953c3f4c28c4e7cb2a5a87ee4c43514c1be9 (patch) | |
| tree | bcd85b890575807037c2adc5fc4ad536463d48ba /features | |
| parent | 5a77234898de9374cde7569b839e07db8a319c37 (diff) | |
Fix qmlandroid.prf
Change-Id: Iaaf64d458197b9b7be0370211a023ec694c3fdfb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'features')
| -rw-r--r-- | features/qmlandroid.prf | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/features/qmlandroid.prf b/features/qmlandroid.prf index 1cc94dd..db67a1b 100644 --- a/features/qmlandroid.prf +++ b/features/qmlandroid.prf @@ -12,17 +12,12 @@ for(pkg, QMLANDROID_PACKAGES) { QMLANDROID_INPUT += $$pkg_path } -defineReplace(qmlAndroidPkgOutputName) { - name = $$basename(1) - name = $$absolute_path($$name, $$OUT_PWD/android-build/src/qt/android/) - name = $$relative_path($$name, $$_PRO_FILE_PWD_) - return($${name}) -} +QMLANDROID_OUTPUT = $$relative_path($$OUT_PWD/android-build/src/qt/android/, $$_PRO_FILE_PWD_) qmlandroid.input = QMLANDROID_INPUT -qmlandroid.output = ${QMAKE_FUNC_FILE_IN_qmlAndroidPkgOutputName} +qmlandroid.output = ${QMAKE_FILE_IN_NAME} !contains(TEMPLATE, vc.*): qmlandroid.variable_out = PRE_TARGETDEPS -qmlandroid.commands = ( $$sprintf($$QMAKE_MKDIR_CMD, ${QMAKE_FILE_OUT}) ) && $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +qmlandroid.commands = ( $$sprintf($$QMAKE_MKDIR_CMD, $$QMLANDROID_OUTPUT) ) && $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} $$QMLANDROID_OUTPUT qmlandroid.name = COPY ${QMAKE_FILE_IN} qmlandroid.CONFIG = no_link no_clean QMAKE_EXTRA_COMPILERS += qmlandroid |