diff options
Diffstat (limited to 'examples/sensors/grue')
-rw-r--r-- | examples/sensors/grue/import/import.pro | 6 | ||||
-rw-r--r-- | examples/sensors/grue/import/qmldir | 1 | ||||
-rw-r--r-- | examples/sensors/grue/lib/lib.pro | 2 | ||||
-rw-r--r-- | examples/sensors/grue/plugin/plugin.pro | 8 | ||||
-rw-r--r-- | examples/sensors/grue/qml.pro | 4 |
5 files changed, 16 insertions, 5 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 3f46103f..71e2249d 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -9,9 +9,13 @@ QT = core gui qml sensors INCLUDEPATH += $$PWD/../lib LIBS += -L$$OUT_PWD/../lib -lgruesensor +# Shared gruesensor library will be installed in parent directory. +# Define rpath so that this plugin will know where to look for it. +unix:!mac: QMAKE_LFLAGS += -Wl,-rpath,\\\$\$ORIGIN/.. + SOURCES = main.cpp -DESTPATH=$$[QT_INSTALL_IMPORTS]/Grue +DESTPATH=$$[QT_INSTALL_EXAMPLES]/qtsensors/grue/Grue target.path=$$DESTPATH INSTALLS += target diff --git a/examples/sensors/grue/import/qmldir b/examples/sensors/grue/import/qmldir index 266b7c11..529b9093 100644 --- a/examples/sensors/grue/import/qmldir +++ b/examples/sensors/grue/import/qmldir @@ -1 +1,2 @@ +module Grue plugin declarative_grue diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro index 9185e294..4d12062e 100644 --- a/examples/sensors/grue/lib/lib.pro +++ b/examples/sensors/grue/lib/lib.pro @@ -12,5 +12,5 @@ HEADERS += gruesensor.h\ SOURCES += gruesensor.cpp\ -target.path=$$[QT_INSTALL_LIBS] +target.path=$$[QT_INSTALL_EXAMPLES]/qtsensors/grue INSTALLS += target diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro index 03e66851..90453537 100644 --- a/examples/sensors/grue/plugin/plugin.pro +++ b/examples/sensors/grue/plugin/plugin.pro @@ -8,12 +8,18 @@ QT = core sensors INCLUDEPATH += $$PWD/../lib LIBS += -L$$OUT_PWD/../lib -lgruesensor +# Shared gruesensor library will be installed in parent directory. +# Define rpath so that this plugin will know where to look for it. +unix:!mac: QMAKE_LFLAGS += -Wl,-rpath,\\\$\$ORIGIN/.. + HEADERS += gruesensorimpl.h\ SOURCES += gruesensorimpl.cpp\ main.cpp\ -target.path=$$[QT_INSTALL_PLUGINS]/sensors + +# Install the plugin under Grue example directory +target.path=$$[QT_INSTALL_EXAMPLES]/qtsensors/grue/$$PLUGIN_TYPE INSTALLS += target OTHER_FILES += \ diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro index 3e1097b2..7593538c 100644 --- a/examples/sensors/grue/qml.pro +++ b/examples/sensors/grue/qml.pro @@ -8,6 +8,6 @@ app.files = \ $$files(*.qml) \ grue.png -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/grue +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/grue INSTALLS += target app |