diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-02-09 13:46:26 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-02-09 15:08:33 +0000 |
| commit | 23187739c67928516292004a4019236d6a546ff1 (patch) | |
| tree | 58910baa4e2e9ca85854b516d3d673cc7c6c5f67 | |
| parent | f7a88c01c71ba50228ad99094277057cdedf74bf (diff) | |
Fix deployment of the qface-ivi-climate example
Task-number: AUTOSUITE-190
Change-Id: I18a9f4d00951d3b0284846d7ef2808f59a512ff8
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
3 files changed, 8 insertions, 3 deletions
diff --git a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro index 710b6dc..4f13532 100644 --- a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -20,5 +20,6 @@ QT += core ivicore QFACE_FORMAT = backend_simulator QFACE_SOURCES = ../example-ivi-climate.qface -target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/backend_simulator +CONFIG += install_ok # Do not cargo-cult this! +target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/qtivi/ INSTALLS += target diff --git a/examples/ivicore/qface-ivi-climate/demo/demo.pro b/examples/ivicore/qface-ivi-climate/demo/demo.pro index f42531e..4f9c1ef 100644 --- a/examples/ivicore/qface-ivi-climate/demo/demo.pro +++ b/examples/ivicore/qface-ivi-climate/demo/demo.pro @@ -13,6 +13,8 @@ SOURCES += main.cpp RESOURCES += qml.qrc +QMAKE_RPATHDIR += $ORIGIN + # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -30,5 +32,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/demo +CONFIG += install_ok # Do not cargo-cult this! +target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate INSTALLS += target diff --git a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro index 836e861..7ebda2f 100644 --- a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro @@ -13,5 +13,6 @@ DEFINES += QT_BUILD_CLIMATE_LIB QFACE_SOURCES = ../example-ivi-climate.qface -target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/frontend +CONFIG += install_ok # Do not cargo-cult this! +target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate INSTALLS += target |