HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2649:d95a3b0d6ff1

Fix android build issues...

Miikka Heikkinen -

r2649:d95a3b0d6ff1

parent child

Context file:

r2649:d95a3b0d6ff1

Collapse all files

demos/demos.pri +3 -1

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             TEMPLATE = app
             QT += core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             # staticlib config causes problems when building executables
             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
                     charts_qmldir.path = /assets/imports/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 } else:contains(TARGET, quick2.*) {
                     charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
                     charts_qmldir.path = /assets/qml/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 }
             }

examples/examples.pri +3 -1

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             TEMPLATE = app
             QT += core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             # staticlib config causes problems when building executables
             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
                     charts_qmldir.path = /assets/imports/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 }
             }

tests/auto/auto.pri +3 -1

             !include( ../tests.pri ) {
                 error( "Couldn't find the tests.pri file!" )
             }
             greaterThan(QT_MAJOR_VERSION, 4) {
                 QT += testlib widgets
             } else {
                 CONFIG  += qtestlib
             }
             !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
             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
             HEADERS += ../inc/tst_definitions.h
             OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET

tests/tests.pri +3 -1

             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = app
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             # staticlib config causes problems when building executables
             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
                     charts_qmldir.path = /assets/imports/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 } else:contains(TARGET, quick2.*) {
                     charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
                     charts_qmldir.path = /assets/qml/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 }
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages