diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:04 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:04 +0200 |
commit | 0784f45d046f481f91dd9b701e237836c8b3fb11 (patch) | |
tree | 2e001c09ec5ef3945440d232c007297755d72bab /examples/sensors/grue/plugin | |
parent | d9776fc6aa8e90926fa024bb64c4e31406d1d091 (diff) | |
parent | ed96b2ea42bd95feeba1085665286a33c9672ab1 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie5c68600ed2b7d6145497dcbceae5f320f7eea6f
Diffstat (limited to 'examples/sensors/grue/plugin')
-rw-r--r-- | examples/sensors/grue/plugin/plugin.pro | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro index 90453537..8aa87ae7 100644 --- a/examples/sensors/grue/plugin/plugin.pro +++ b/examples/sensors/grue/plugin/plugin.pro @@ -5,21 +5,23 @@ PLUGIN_TYPE = sensors QT = core sensors +DESTDIR = ../$$PLUGIN_TYPE + INCLUDEPATH += $$PWD/../lib -LIBS += -L$$OUT_PWD/../lib -lgruesensor +LIBS += -L$$OUT_PWD/.. -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\ +HEADERS += gruesensorimpl.h -SOURCES += gruesensorimpl.cpp\ - main.cpp\ +SOURCES += gruesensorimpl.cpp \ + main.cpp # Install the plugin under Grue example directory -target.path=$$[QT_INSTALL_EXAMPLES]/qtsensors/grue/$$PLUGIN_TYPE +target.path=$$[QT_INSTALL_EXAMPLES]/sensors/grue/$$PLUGIN_TYPE INSTALLS += target OTHER_FILES += \ |