diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2012-09-25 15:23:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 10:30:07 +0200 |
| commit | 8566f3e369ead9510dc7a52e4ee93588c2eebed3 (patch) | |
| tree | 0fd9ae0158fce78135fd7a989e1e1ae5a875de70 /examples/sensors/grue | |
| parent | edcc28ea3dac9a42094a68ef873f462c79d79361 (diff) | |
| download | qtsensors-8566f3e369ead9510dc7a52e4ee93588c2eebed3.tar.gz | |
QtSensors examples: Install plugins under the example tree structure
QtSensors 'Grue' and 'Sensor Explorer' examples include qml imports,
a Qt plugin and a shared library. Modify the related .pro files to
install everything under QT_INSTALL_EXAMPLES, instead of the main
Qt install directory.
Task-number: QTBUG-26860
Change-Id: I32d4f66e5b18468c17b668ecb76f969ed15e4c50
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Alex <ablasche@gmail.com>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
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 3f46103..71e2249 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 266b7c1..529b909 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 9185e29..4d12062 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 03e6685..9045353 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 3e1097b..7593538 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 |