diff options
Diffstat (limited to 'examples/sensors/sensor_explorer')
-rw-r--r-- | examples/sensors/sensor_explorer/import/import.pro | 14 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/import/qsensorsimport.pri | 27 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/notions.json | 5 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/PropertyList.qml (renamed from examples/sensors/sensor_explorer/PropertyList.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/SensorList.qml (renamed from examples/sensors/sensor_explorer/SensorList.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml (renamed from examples/sensors/sensor_explorer/components/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/Button.qml (renamed from examples/sensors/sensor_explorer/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/TextField.qml (renamed from examples/sensors/sensor_explorer/components/TextField.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png (renamed from examples/sensors/sensor_explorer/components/images/button_background_disabled.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png (renamed from examples/sensors/sensor_explorer/components/images/button_background_normal.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png (renamed from examples/sensors/sensor_explorer/components/images/button_background_pressed.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png (renamed from examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png) | bin | 936 -> 936 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png (renamed from examples/sensors/sensor_explorer/components/images/textfield_background_normal.png) | bin | 767 -> 767 bytes | |||
-rw-r--r--[-rwxr-xr-x] | examples/sensors/sensor_explorer/qml_app/icon.png (renamed from examples/sensors/sensor_explorer/icon.png) | bin | 2205 -> 2205 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/images/listitem_select.png (renamed from examples/sensors/sensor_explorer/images/listitem_select.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/info.json (renamed from examples/sensors/sensor_explorer/info.json) | 2 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/main.qml (renamed from examples/sensors/sensor_explorer/main.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/qml_app.pro (renamed from examples/sensors/sensor_explorer/qml.pro) | 13 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/sensor_explorer.pro | 3 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/settings.json | 7 |
20 files changed, 12 insertions, 59 deletions
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index 7baec42..ec78653 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 b8af2b7..0000000 --- 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) -} diff --git a/examples/sensors/sensor_explorer/notions.json b/examples/sensors/sensor_explorer/notions.json deleted file mode 100644 index 95d0519..0000000 --- a/examples/sensors/sensor_explorer/notions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "notion-file-version": 1, - "capabilities": [ - ] -} diff --git a/examples/sensors/sensor_explorer/PropertyList.qml b/examples/sensors/sensor_explorer/qml_app/PropertyList.qml index ba956fb..ba956fb 100644 --- a/examples/sensors/sensor_explorer/PropertyList.qml +++ b/examples/sensors/sensor_explorer/qml_app/PropertyList.qml diff --git a/examples/sensors/sensor_explorer/SensorList.qml b/examples/sensors/sensor_explorer/qml_app/SensorList.qml index f95572b..f95572b 100644 --- a/examples/sensors/sensor_explorer/SensorList.qml +++ b/examples/sensors/sensor_explorer/qml_app/SensorList.qml diff --git a/examples/sensors/sensor_explorer/components/ApplicationWindow.qml b/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml index cab5e94..cab5e94 100644 --- a/examples/sensors/sensor_explorer/components/ApplicationWindow.qml +++ b/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml diff --git a/examples/sensors/sensor_explorer/components/Button.qml b/examples/sensors/sensor_explorer/qml_app/components/Button.qml index 537a8bc..537a8bc 100644 --- a/examples/sensors/sensor_explorer/components/Button.qml +++ b/examples/sensors/sensor_explorer/qml_app/components/Button.qml diff --git a/examples/sensors/sensor_explorer/components/TextField.qml b/examples/sensors/sensor_explorer/qml_app/components/TextField.qml index c1feaf2..c1feaf2 100644 --- a/examples/sensors/sensor_explorer/components/TextField.qml +++ b/examples/sensors/sensor_explorer/qml_app/components/TextField.qml diff --git a/examples/sensors/sensor_explorer/components/images/button_background_disabled.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png Binary files differindex 62a00b9..62a00b9 100644 --- a/examples/sensors/sensor_explorer/components/images/button_background_disabled.png +++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png diff --git a/examples/sensors/sensor_explorer/components/images/button_background_normal.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png Binary files differindex 1fecad5..1fecad5 100644 --- a/examples/sensors/sensor_explorer/components/images/button_background_normal.png +++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png diff --git a/examples/sensors/sensor_explorer/components/images/button_background_pressed.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png Binary files differindex 149529e..149529e 100644 --- a/examples/sensors/sensor_explorer/components/images/button_background_pressed.png +++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png diff --git a/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png Binary files differindex 98bc601..98bc601 100644 --- a/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png +++ b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png diff --git a/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png Binary files differindex b90b50c..b90b50c 100644 --- a/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png +++ b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png diff --git a/examples/sensors/sensor_explorer/icon.png b/examples/sensors/sensor_explorer/qml_app/icon.png Binary files differindex c48b609..c48b609 100755..100644 --- a/examples/sensors/sensor_explorer/icon.png +++ b/examples/sensors/sensor_explorer/qml_app/icon.png diff --git a/examples/sensors/sensor_explorer/images/listitem_select.png b/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png Binary files differindex def234f..def234f 100644 --- a/examples/sensors/sensor_explorer/images/listitem_select.png +++ b/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png diff --git a/examples/sensors/sensor_explorer/info.json b/examples/sensors/sensor_explorer/qml_app/info.json index 95b56fe..ce7e0c3 100644 --- a/examples/sensors/sensor_explorer/info.json +++ b/examples/sensors/sensor_explorer/qml_app/info.json @@ -7,7 +7,7 @@ "Subcategory": "utility", "MainQML": "main.qml", "Version": "1.0.0", - "Identifier": "com.nokia.mt.sensorexplorer", + "Identifier": "com.nokia.mt.sensor_explorer", "Summary": "QML Sensors Explorer demo", "Author": "Qt" } diff --git a/examples/sensors/sensor_explorer/main.qml b/examples/sensors/sensor_explorer/qml_app/main.qml index 8864160..8864160 100644 --- a/examples/sensors/sensor_explorer/main.qml +++ b/examples/sensors/sensor_explorer/qml_app/main.qml diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml_app/qml_app.pro index 71022cd..2eb78ce 100644 --- a/examples/sensors/sensor_explorer/qml.pro +++ b/examples/sensors/sensor_explorer/qml_app/qml_app.pro @@ -1,19 +1,16 @@ TEMPLATE = aux app.files = \ - info.json \ - notions.json \ - settings.json \ - main.qml \ PropertyList.qml \ + components \ + images \ + info.json \ SensorList.qml \ icon.png \ - components \ - images + main.qml !isEmpty(EXAMPLES_PREFIX) { - TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.sensorexplorer - app.path = $$TARGET_DIR + app.path = $$EXAMPLES_PREFIX/com.nokia.mt.sensor_explorer INSTALLS = app } diff --git a/examples/sensors/sensor_explorer/sensor_explorer.pro b/examples/sensors/sensor_explorer/sensor_explorer.pro index 85ba45e..759e930 100644 --- a/examples/sensors/sensor_explorer/sensor_explorer.pro +++ b/examples/sensors/sensor_explorer/sensor_explorer.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS = \ import \ - qml.pro + qml_app diff --git a/examples/sensors/sensor_explorer/settings.json b/examples/sensors/sensor_explorer/settings.json deleted file mode 100644 index a7db387..0000000 --- a/examples/sensors/sensor_explorer/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "1.0.0", - "identifier": "com.nokia.mt.sensorexplorer", - "label": "QML Sensor Explorer demo", - "settings": [ - ] -} |