diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-31 15:15:52 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2013-10-31 15:19:14 +0200 |
| commit | d95a3b0d6ff1e5f4bbe4886246f0a985bc15d539 (patch) | |
| tree | 764d6c4e369426be5b7fd70aa676475b0ed05028 | |
| parent | 8da9536b16ef71b038a86a82e7c71f76cd21a922 (diff) | |
Fix android build issues
Change-Id: I2472408330307e1bccede1b842eae365e850f848
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| -rw-r--r-- | demos/demos.pri | 4 | ||||
| -rw-r--r-- | examples/examples.pri | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pri | 4 | ||||
| -rw-r--r-- | tests/tests.pri | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/demos/demos.pri b/demos/demos.pri index b6955bab..5f3df144 100644 --- a/demos/demos.pri +++ b/demos/demos.pri @@ -18,7 +18,9 @@ staticlib: CONFIG-=staticlib android { # Workaround to fix android deployment, which seems to always look for target in # OUT_PWD instead of DESTDIR. - QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" + contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") + QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS contains(TARGET, qml.*) { charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir diff --git a/examples/examples.pri b/examples/examples.pri index 4948dcb3..9744a3a4 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -18,7 +18,9 @@ staticlib: CONFIG-=staticlib android { # Workaround to fix android deployment, which seems to always look for target in # OUT_PWD instead of DESTDIR. - QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" + contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") + QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS contains(TARGET, qml.*) { charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index 5eb9b174..c528b34a 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -13,7 +13,9 @@ android { # Workaround to fix android deployment, which seems to always look for target in # OUT_PWD instead of DESTDIR. Need to override the QMAKE_POST_LINK setting done # in tests.pri, as "tst_" was prepended to the target. - QMAKE_POST_LINK = $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" + contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") + QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS } INCLUDEPATH += ../inc diff --git a/tests/tests.pri b/tests/tests.pri index 662cdcab..ec0cd754 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -16,7 +16,9 @@ staticlib: CONFIG-=staticlib android { # Workaround to fix android deployment, which seems to always look for target in # OUT_PWD instead of DESTDIR. - QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" + contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") + QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS contains(TARGET, qml.*) { charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir |