diff --git a/demos/demos.pri b/demos/demos.pri index b6955ba..5f3df14 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 4948dcb..9744a3a 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 5eb9b17..c528b34 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 662cdca..ec0cd75 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