From 52c831db165f5068826dddef4d41427a98a42dfd Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 13 Aug 2013 14:40:13 +0200 Subject: Doc: Update Grue Sensor example Fix a number of issues with the example: - Add \omit to generated doc sections, we don't want qdoc to process these (not part of Qt docs) - Combine the 5 separate examples into a single \example and discuss each subproject in a subsection - Add example image to doc - Fix deployment/build target directories and import paths - Define a 'reading' property for the sensor to make it work on QtSensors 5.1 - Fix the Grue QML application to avoid flicker from frequent updates. Task-number: QTBUG-32881 Change-Id: I2785faead1baaf5b1ae9d05df3398e018e945418 Reviewed-by: Jerome Pasion Reviewed-by: Lorn Potter --- examples/sensors/grue/plugin/plugin.pro | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'examples/sensors/grue/plugin') 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 += \ -- cgit v1.2.3