diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-08-28 11:26:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-11 11:35:00 +0100 |
| commit | a840cbffba476205eba81f56f40ec32cea6097cc (patch) | |
| tree | 1c8f0b294884aaedc03e5eb49a4918c0a7d8326f /examples/sensors/sensor_explorer/import/import.pro | |
| parent | e3af89e2630bba68d3f10a33bccdd19bbc46664d (diff) | |
| download | qtsensors-a840cbffba476205eba81f56f40ec32cea6097cc.tar.gz | |
Doc: Update Sensor Explorer example
Following changes are made to the example
- Use of Qt Quick Controls / TableView to present the sensor
information, reducing the example to a single QML file
- Updated launcher main.cpp for the QML example
- Remove separate example doc for the import subproject
- Various fixes to example doc, add a screenshot
- Ensure import module + qmldir are built/deployed to
correct location
Task-number: QTBUG-32881
Task-number: QTBUG-33875
Change-Id: I0ed7c7ebc916fcad6da5e3c66d81be8f348a93e1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/sensors/sensor_explorer/import/import.pro')
| -rw-r--r-- | examples/sensors/sensor_explorer/import/import.pro | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index 85f471c..196c373 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -2,21 +2,39 @@ TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(declarative_explorer) -TARGETPATH = Explorer +DESTDIR = ../Explorer QT += qml sensors -SOURCES = main.cpp explorer.cpp sensoritem.cpp propertyinfo.cpp -HEADERS = explorer.h sensoritem.h propertyinfo.h +SOURCES = \ + main.cpp \ + explorer.cpp \ + sensoritem.cpp \ + propertyinfo.cpp -DESTPATH=$$[QT_INSTALL_EXAMPLES]/qtsensors/sensor_explorer/Explorer +HEADERS = \ + explorer.h \ + sensoritem.h \ + propertyinfo.h -target.path=$$DESTPATH -INSTALLS += target +DESTPATH=$$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer/Explorer +target.path=$$DESTPATH qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH -INSTALLS += qmldir +INSTALLS += target qmldir OTHER_FILES += \ plugin.json qmldir + +copyfile = $$PWD/qmldir +copydest = $$DESTDIR + +# On Windows, use backslashes as directory separators +win32: { + copyfile ~= s,/,\\,g + copydest ~= s,/,\\,g +} + +# Copy the qmldir file to the same folder as the plugin binary +QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$copyfile) $$quote($$copydest) $$escape_expand(\\n\\t) |