summaryrefslogtreecommitdiffstats
path: root/examples/sensors/sensor_explorer/import
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-02-24 13:27:57 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-27 01:45:33 +0100
commit527740c721ee37472146a7302eae3ece58779e93 (patch)
tree6a80300d4667ce4a68608406f7c3cc75358c1368 /examples/sensors/sensor_explorer/import
parent1fccbe513dde883cb310b44bf9ce13bc5df51dfa (diff)
Update the examples.
Use .pro files, no .qmlproject files. Remove unused settings.json and notions.json files. Install to EXAMPLES_PREFIX when it is defined. Dest paths match info.json identifiers. No execute bit on non-executable files. Change-Id: Ib09320bd976b8aec7512531ce11ed92f05912dde Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
Diffstat (limited to 'examples/sensors/sensor_explorer/import')
-rw-r--r--examples/sensors/sensor_explorer/import/import.pro14
-rw-r--r--examples/sensors/sensor_explorer/import/qsensorsimport.pri27
2 files changed, 5 insertions, 36 deletions
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro
index 7baec429..ec78653e 100644
--- a/examples/sensors/sensor_explorer/import/import.pro
+++ b/examples/sensors/sensor_explorer/import/import.pro
@@ -1,19 +1,15 @@
-TARGET = declarative_explorer
-TARGETPATH = Explorer
+TEMPLATE = lib
+CONFIG += plugin
-include(qsensorsimport.pri)
+TARGET = $$qtLibraryTarget(declarative_explorer)
+TARGETPATH = Explorer
QT += declarative sensors
SOURCES = main.cpp explorer.cpp sensoritem.cpp propertyinfo.cpp
HEADERS = explorer.h sensoritem.h propertyinfo.h
-symbian {
- TARGET.EPOCALLOWDLLDATA = 1
- TARGET.CAPABILITY = ALL -TCB
-}
-
-!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/sensor_explorer/imports/Explorer
+!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/com.nokia.mt.sensor_explorer/imports/Explorer
else:DESTPATH=$$[QT_INSTALL_IMPORTS]/Explorer
target.path=$$DESTPATH
diff --git a/examples/sensors/sensor_explorer/import/qsensorsimport.pri b/examples/sensors/sensor_explorer/import/qsensorsimport.pri
deleted file mode 100644
index b8af2b7b..00000000
--- a/examples/sensors/sensor_explorer/import/qsensorsimport.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-load(qt_module)
-
-symbian:load(qt_plugin)
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
- error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-isEmpty(TARGET) {
- error("qimportbase.pri: You must provide a TARGET!")
-}
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
-
-wince*:LIBS += $$QMAKE_LIBS_GUI
-
-symbian: {
- TARGET.EPOCALLOWDLLDATA=1
- TARGET.CAPABILITY = All -Tcb
- load(armcc_warnings)
-}