diff options
10 files changed, 10 insertions, 0 deletions
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro index ef80b73..7fc2149 100644 --- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro @@ -7,6 +7,7 @@ CONFIG += ivigenerator plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ QFACE_FORMAT = backend_simulator QFACE_SOURCES = ../instrument-cluster.qface diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/imports.pro b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/imports.pro index 9b26bad..0c57ba7 100644 --- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/imports.pro +++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/imports.pro @@ -11,6 +11,7 @@ QFACE_SOURCES = ../instrument-cluster.qface load(ivigenerator) DESTDIR = $$OUT_PWD/$$replace(URI, \\., /) +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../../../../ exists($$OUT_PWD/qmldir) { cpqmldir.files = $$OUT_PWD/qmldir \ diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro index 73e020f..7d24957 100644 --- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro @@ -7,6 +7,7 @@ CONFIG += ivigenerator plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ QFACE_FORMAT = backend_simulator QFACE_SOURCES = ../instrument-cluster.qface diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro index 631ab63..e5e9204 100644 --- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro +++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro @@ -11,6 +11,7 @@ QFACE_SOURCES = ../instrument-cluster.qface load(ivigenerator) DESTDIR = $$OUT_PWD/$$replace(URI, \\., /) +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../../../../ exists($$OUT_PWD/qmldir) { cpqmldir.files = $$OUT_PWD/qmldir \ diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro index ad237bc..911d87f 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro @@ -7,6 +7,7 @@ CONFIG += ivigenerator plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ QFACE_FORMAT = backend_qtro QFACE_SOURCES = ../instrument-cluster.qface diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro index 0a1f191..6b046d9 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro @@ -7,6 +7,7 @@ CONFIG += ivigenerator plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ QFACE_FORMAT = backend_simulator QFACE_SOURCES = ../instrument-cluster.qface diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/imports.pro b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/imports.pro index 2f11d1f..afe65f0 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/imports.pro +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/imports.pro @@ -11,6 +11,7 @@ QFACE_SOURCES = ../instrument-cluster.qface load(ivigenerator) DESTDIR = $$OUT_PWD/$$replace(URI, \\., /) +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../../../../ exists($$OUT_PWD/qmldir) { cpqmldir.files = $$OUT_PWD/qmldir \ diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/backend_dbus.pro b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/backend_dbus.pro index 3529cf6..5d086d2 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/backend_dbus.pro +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/backend_dbus.pro @@ -7,6 +7,7 @@ CONFIG += plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend $$PWD/../demo_server +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ PLUGIN_TYPE = qtivi diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro index e0bf54a..f2fbdcd 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro @@ -7,6 +7,7 @@ CONFIG += ivigenerator plugin LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../ QFACE_FORMAT = backend_simulator QFACE_SOURCES = ../instrument-cluster.qface diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/imports.pro b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/imports.pro index f78be28..4545f6b 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/imports.pro +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/imports.pro @@ -11,6 +11,7 @@ QFACE_SOURCES = ../instrument-cluster.qface load(ivigenerator) DESTDIR = $$OUT_PWD/$$replace(URI, \\., /) +QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../../../../ exists($$OUT_PWD/qmldir) { cpqmldir.files = $$OUT_PWD/qmldir \ |