##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix android build issues...
Miikka Heikkinen -
r2649:d95a3b0d6ff1
parent child
Show More
Side by Side Unified
Context file:
r2649:d95a3b0d6ff1 Loading diff...:
Show file before | Show file after | Hide comments
@@ -18,7 +18,9 staticlib: CONFIG-=staticlib
18 android {
18 android {
19 # Workaround to fix android deployment, which seems to always look for target in
19 # Workaround to fix android deployment, which seems to always look for target in
20 # OUT_PWD instead of DESTDIR.
20 # OUT_PWD instead of DESTDIR.
21 QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so
21 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
22 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
23 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
22
24
23 contains(TARGET, qml.*) {
25 contains(TARGET, qml.*) {
24 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
26 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
Show file before | Show file after | Hide comments
@@ -18,7 +18,9 staticlib: CONFIG-=staticlib
18 android {
18 android {
19 # Workaround to fix android deployment, which seems to always look for target in
19 # Workaround to fix android deployment, which seems to always look for target in
20 # OUT_PWD instead of DESTDIR.
20 # OUT_PWD instead of DESTDIR.
21 QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so
21 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
22 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
23 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
22
24
23 contains(TARGET, qml.*) {
25 contains(TARGET, qml.*) {
24 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
26 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
Show file before | Show file after | Hide comments
@@ -13,7 +13,9 android {
13 # Workaround to fix android deployment, which seems to always look for target in
13 # Workaround to fix android deployment, which seems to always look for target in
14 # OUT_PWD instead of DESTDIR. Need to override the QMAKE_POST_LINK setting done
14 # OUT_PWD instead of DESTDIR. Need to override the QMAKE_POST_LINK setting done
15 # in tests.pri, as "tst_" was prepended to the target.
15 # in tests.pri, as "tst_" was prepended to the target.
16 QMAKE_POST_LINK = $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so
16 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
17 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
18 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
17 }
19 }
18
20
19 INCLUDEPATH += ../inc
21 INCLUDEPATH += ../inc
Show file before | Show file after | Hide comments
@@ -16,7 +16,9 staticlib: CONFIG-=staticlib
16 android {
16 android {
17 # Workaround to fix android deployment, which seems to always look for target in
17 # Workaround to fix android deployment, which seems to always look for target in
18 # OUT_PWD instead of DESTDIR.
18 # OUT_PWD instead of DESTDIR.
19 QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so
19 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
20 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
21 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
20
22
21 contains(TARGET, qml.*) {
23 contains(TARGET, qml.*) {
22 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
24 charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
General Comments 0
You need to be logged in to leave comments. Login now